Merge 62881 - Moves instant back into flags....

chrome/browser/views/options/general_page_view.h

Index: chrome/browser/views/options/general_page_view.h
===================================================================
--- chrome/browser/views/options/general_page_view.h	(revision 62881)
+++ chrome/browser/views/options/general_page_view.h	(working copy)
@@ -13,7 +13,6 @@
 #include "chrome/browser/views/url_picker.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/button/button.h"
-#include "views/controls/link.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 
@@ -40,8 +39,7 @@
                         public views::Textfield::Controller,
                         public UrlPickerDelegate,
                         public views::TableViewObserver,
-                        public ShellIntegration::DefaultBrowserObserver,
-                        public views::LinkController {
+                        public ShellIntegration::DefaultBrowserObserver {
  public:
   explicit GeneralPageView(Profile* profile);
   virtual ~GeneralPageView();
@@ -66,9 +64,6 @@
   virtual void NotifyPrefChanged(const std::string* pref_name);
   virtual void HighlightGroup(OptionsGroup highlight_group);
 
-  // LinkController implementation:
-  virtual void LinkActivated(views::Link* source, int event_flags);
-
  private:
   // ShellIntegration::DefaultBrowserObserver implementation:
   // Updates the UI state to reflect the current default browser state.
@@ -148,13 +143,11 @@
   StringPrefMember homepage_;
   BooleanPrefMember show_home_button_;
 
-  // Controls for the Search group
+  // Controls for the Default Search group
   OptionsGroupView* default_search_group_;
   views::Combobox* default_search_engine_combobox_;
   views::NativeButton* default_search_manage_engines_button_;
   scoped_ptr<SearchEngineListModel> default_search_engines_model_;
-  views::Checkbox* instant_checkbox_;
-  views::Link* instant_link_;
 
   // Controls for the Default Browser group
   OptionsGroupView* default_browser_group_;