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

chrome/browser/views/options/general_page_view.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/views/options/options_page_view.h"
 #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"
 
 namespace views {
 class Checkbox;
 class GroupboxView;
 class Label;
 class NativeButton;
 class RadioButton;
 class TableView;
 class Textfield;
 }
 class CustomHomePagesTableModel;
 class OptionsGroupView;
 class SearchEngineListModel;
 class TableModel;
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView
 
 class GeneralPageView : public OptionsPageView,
                         public views::Combobox::Listener,
                         public views::ButtonListener,
                         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();
 
  protected:
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // views::Combobox::Listener implementation:
   virtual void ItemChanged(views::Combobox* combobox,
                            int prev_index,
                            int new_index);
 
   // views::Textfield::Controller implementation:
   virtual void ContentsChanged(views::Textfield* sender,
                                const std::wstring& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke& key);
 
   // OptionsPageView implementation:
   virtual void InitControlLayout();
   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.
   virtual void SetDefaultBrowserUIState(
       ShellIntegration::DefaultBrowserUIState state);
 
   // For Side by Side installs, this will disable the Default Browser setting
   // and display an explanitory message.
   void SetDefaultBrowserUIStateForSxS();
 
@@ skipping 59 matching lines @@
   // Controls for the Home Page group
   OptionsGroupView* homepage_group_;
   views::RadioButton* homepage_use_newtab_radio_;
   views::RadioButton* homepage_use_url_radio_;
   views::Textfield* homepage_use_url_textfield_;
   views::Checkbox* homepage_show_home_button_checkbox_;
   BooleanPrefMember new_tab_page_is_home_page_;
   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_;
   views::Label* default_browser_status_label_;
   views::NativeButton* default_browser_use_as_default_button_;
 
   // The helper object that performs default browser set/check tasks.
   scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
 
   PrefChangeRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(GeneralPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_