From 5b0036a0adfa47f3500ade40c2725a88716c97d2 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 19 Apr 2015 07:45:16 +0100
Subject: Activate vomnibar in window.top; strip Vimium Labs.

Since the vomnibar now always is initialised and opened the top window
(see d67347461da5a0468547e4c807a54bb40746faf4), there's no longer a need
for this to be a Vimium Labs feature.
---
 pages/options.coffee |  1 -
 pages/options.html   | 34 ----------------------------------
 2 files changed, 35 deletions(-)

diff --git a/pages/options.coffee b/pages/options.coffee
index 55b5b63a..d2950348 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -261,7 +261,6 @@ initOptionsPage = ->
     searchEngines: TextOption
     searchUrl: NonEmptyTextOption
     userDefinedLinkHintCss: TextOption
-    vomnibarInTopFrame: CheckBoxOption
 
   # Populate options. The constructor adds each new object to "Option.all".
   for name, type of options
diff --git a/pages/options.html b/pages/options.html
index 19298189..f89ddcbb 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -70,11 +70,6 @@ b: http://b.com/?q=%s description
            <td colspan="2"><a href="#" id="advancedOptionsLink">Show advanced options&hellip;</a></td>
         </tr>
         <tbody id='advancedOptions'>
-          <tr>
-             <td colspan="3">
-               <header>Advanced Options</header>
-             </td>
-          </tr>
           <tr>
             <td class="caption">Scroll step size</td>
             <td>
@@ -238,35 +233,6 @@ b: http://b.com/?q=%s description
               <div class="nonEmptyTextOption">
             </td>
           </tr>
-          <tr>
-             <td colspan="3">
-               <header>Vimium Labs</header>
-               <p>
-                  These features are awesome!  However, they're also not yet fully baked.  They might
-                  not always work, may be subject to substantial change in a future release, and could even be
-                  withdrawn entirely.
-               </p>
-
-               <p>
-                  Please provide feedback or suggestions on
-                  <a href="https://github.com/philc/vimium/issues" target="_blank">github</a>.
-               </p>
-             </td>
-          </tr>
-          <tr>
-            <td class="caption">Experiments</td>
-            <td verticalAlign="top" class="booleanOption">
-              <div class="help">
-                <div class="example">
-                  On pages with multiple frames, always open a full-size vomnibar in the tab's main frame.
-                </div>
-              </div>
-              <label>
-                <input id="vomnibarInTopFrame" type="checkbox"/>
-                Open vomnibar in top frame
-              </label>
-            </td>
-          </tr>
         </tbody>
       </table>
     </div>
-- 
cgit v1.2.3