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

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 3809005: Moves instant back into flags. (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Created 10 years, 2 months 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
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 24c70f895cb1efb1745b7b6001198953997a8e66..40f9d71511e0712ecc7332adeb227ed78f7adaef 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -28,7 +28,8 @@ void InstantController::RegisterUserPrefs(PrefService* prefs) {
}
// static
-bool InstantController::IsEnabled(Profile* profile) {
+bool InstantController::IsEnabled() {
+ // TODO: convert to kInstantEnabled once pref lands.
static bool enabled = false;
static bool checked = false;
if (!checked) {
@@ -36,8 +37,7 @@ bool InstantController::IsEnabled(Profile* profile) {
enabled = CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableMatchPreview);
}
- PrefService* prefs = profile->GetPrefs();
- return (enabled || (prefs && prefs->GetBoolean(prefs::kInstantEnabled)));
+ return enabled;
}
InstantController::InstantController(InstantDelegate* delegate)
« no previous file with comments | « chrome/browser/instant/instant_controller.h ('k') | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698