Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: chrome/browser/gtk/options/general_page_gtk.cc

Issue 5023001: Handful of related instant changes: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux build Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/instant_confirm_dialog_gtk.cc ('k') | chrome/browser/instant/instant_confirm_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/general_page_gtk.cc
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
index 01aef9efdbae9ffa8cad05a272fb8f107d622409..3ce8f452f5221e4274c8cf25b94e1b9a19099d9c 100644
--- a/chrome/browser/gtk/options/general_page_gtk.cc
+++ b/chrome/browser/gtk/options/general_page_gtk.cc
@@ -20,6 +20,7 @@
#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"
@@ -555,7 +556,7 @@ void GeneralPageGtk::OnInstantToggled(GtkWidget* toggle_button) {
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?
« no previous file with comments | « chrome/browser/gtk/instant_confirm_dialog_gtk.cc ('k') | chrome/browser/instant/instant_confirm_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698