Handful of related instant changes:

chrome/browser/gtk/options/general_page_gtk.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/gtk/options/general_page_gtk.h"
 
 #include <set>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/keyword_editor_view.h"
 #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.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/prefs/session_startup_pref.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/show_options_url.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 515 matching lines @@
   if (initializing_)
     return;
 
   bool enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle_button));
 
   if (enabled) {
     if (!instant_.GetValue())
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(instant_checkbox_), false);
     browser::ShowInstantConfirmDialogIfNecessary(GetWindow(), profile());
   } else {
-    instant_.SetValue(enabled);
+    InstantController::Disable(profile());
   }
 
   // TODO(estade): UMA?
 }
 
 void GeneralPageGtk::OnDefaultSearchEngineChanged(GtkWidget* combo_box) {
   if (default_search_initializing_)
     return;
   SetDefaultSearchEngineFromComboBox();
 }
@@ skipping 229 matching lines @@
   int desired_width = allocation->x - sender->parent->allocation.x;
   GtkRequisition req;
   gtk_widget_size_request(instant_indent_, &req);
   if (req.width != desired_width)
     gtk_widget_set_size_request(instant_indent_, desired_width, -1);
 }
 
 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) {
   browser::ShowOptionsURL(profile(), GURL(browser::kInstantLearnMoreURL));
 }