Handful of related instant changes:

chrome/browser/ui/views/options/general_page_view.cc

 // 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.
 
 #include "chrome/browser/views/options/general_page_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
+#include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 #include "chrome/browser/show_options_url.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/options/managed_prefs_banner_view.h"
@@ skipping 177 matching lines @@
       startup_use_current_page_button_(NULL),
       startup_custom_pages_table_(NULL),
       homepage_group_(NULL),
       homepage_use_newtab_radio_(NULL),
       homepage_use_url_radio_(NULL),
       homepage_use_url_textfield_(NULL),
       homepage_show_home_button_checkbox_(NULL),
       default_search_group_(NULL),
       default_search_manage_engines_button_(NULL),
       instant_checkbox_(NULL),
+      instant_type_label_(NULL),
       instant_link_(NULL),
       default_browser_group_(NULL),
       default_browser_status_label_(NULL),
       default_browser_use_as_default_button_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           default_browser_worker_(
               new ShellIntegration::DefaultBrowserWorker(this))),
       OptionsPageView(profile) {
 }
 
@@ skipping 62 matching lines @@
                             NULL);
     KeywordEditorView::Show(profile());
   } else if (sender == instant_checkbox_) {
     if (instant_checkbox_->checked()) {
       // Don't toggle immediately, instead let
       // ShowInstantConfirmDialogIfNecessary do it.
       instant_checkbox_->SetChecked(false);
       browser::ShowInstantConfirmDialogIfNecessary(
           GetWindow()->GetNativeWindow(), profile());
     } else {
-      profile()->GetPrefs()->SetBoolean(prefs::kInstantEnabled, false);
+      InstantController::Disable(profile());
     }
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView, views::Combobox::Listener implementation:
 
 void GeneralPageView::ItemChanged(views::Combobox* combobox,
                                   int prev_index, int new_index) {
   if (combobox == default_search_engine_combobox_) {
@@ skipping 125 matching lines @@
     EnableHomepageURLField(!homepage_is_new_tab);
   }
 
   if (!pref_name || *pref_name == prefs::kShowHomeButton) {
     homepage_show_home_button_checkbox_->SetChecked(
         show_home_button_.GetValue());
     homepage_show_home_button_checkbox_->SetEnabled(
         !show_home_button_.IsManaged());
   }
 
-  if (!pref_name || *pref_name == prefs::kInstantEnabled)
-    instant_checkbox_->SetChecked(prefs->GetBoolean(prefs::kInstantEnabled));
+  if (!pref_name || *pref_name == prefs::kInstantEnabled) {
+    bool is_instant_enabled = prefs->GetBoolean(prefs::kInstantEnabled);
+    instant_checkbox_->SetChecked(is_instant_enabled);
+    if (is_instant_enabled) {
+      instant_type_label_->SetText(
+          L"[" +
+          UTF8ToWide(
+              base::IntToString(prefs->GetInteger(prefs::kInstantType))) +
+          L"]");
+    }
+    instant_type_label_->SetVisible(is_instant_enabled);
+    instant_type_label_->GetParent()->Layout();
+  }
 }
 
 void GeneralPageView::HighlightGroup(OptionsGroup highlight_group) {
   if (highlight_group == OPTIONS_GROUP_DEFAULT_SEARCH)
     default_search_group_->SetHighlighted(true);
 }
 
 void GeneralPageView::LinkActivated(views::Link* source, int event_flags) {
   DCHECK(source == instant_link_);
   browser::ShowOptionsURL(profile(),
@@ skipping 192 matching lines @@
       new views::Combobox(default_search_engines_model_.get());
   default_search_engines_model_->SetCombobox(default_search_engine_combobox_);
   default_search_engine_combobox_->set_listener(this);
 
   default_search_manage_engines_button_ = new views::NativeButton(
       this,
       l10n_util::GetString(IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK));
 
   instant_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_INSTANT_PREF));
-  instant_checkbox_->SetMultiLine(true);
+  instant_checkbox_->SetMultiLine(false);
   instant_checkbox_->set_listener(this);
 
+  instant_type_label_ = new views::Label();
+
   instant_link_ = new views::Link(l10n_util::GetString(IDS_LEARN_MORE));
   instant_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   instant_link_->SetController(this);
 
   using views::GridLayout;
   using views::ColumnSet;
 
   views::View* contents = new views::View;
   GridLayout* layout = new GridLayout(contents);
   contents->SetLayoutManager(layout);
 
   const int double_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
-  const int single_column_view_set_id = 1;
-  column_set = layout->AddColumnSet(single_column_view_set_id);
-  column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
+  const int checkbox_column_view_set_id = 1;
+  column_set = layout->AddColumnSet(checkbox_column_view_set_id);
+  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
+                        GridLayout::USE_PREF, 0, 0);
+  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   const int link_column_set_id = 2;
   column_set = layout->AddColumnSet(link_column_set_id);
   // TODO(sky): this isn't right, we need a method to determine real indent.
   column_set->AddPaddingColumn(0, views::Checkbox::GetTextIndent() + 3);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(default_search_engine_combobox_);
   layout->AddView(default_search_manage_engines_button_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
-  layout->StartRow(0, single_column_view_set_id);
+  layout->StartRow(0, checkbox_column_view_set_id);
   layout->AddView(instant_checkbox_);
+  layout->AddView(instant_type_label_);
   layout->AddPaddingRow(0, 0);
 
   layout->StartRow(0, link_column_set_id);
   layout->AddView(
       new views::Label(l10n_util::GetString(IDS_INSTANT_PREF_WARNING)));
   layout->AddView(instant_link_);
 
   default_search_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),
       std::wstring(), true);
@@ skipping 162 matching lines @@
   }
   homepage_use_url_textfield_->SetEnabled(enabled);
   homepage_use_url_textfield_->SetReadOnly(!enabled);
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }