From 7c60f50438f48400252f330c313a99897b5b7ca9 Mon Sep 17 00:00:00 2001 From: "sreeram@chromium.org" Date: Thu, 14 Feb 2013 03:39:32 +0000 Subject: Consolidate search terms extraction and Instant process determination. Reverts changes made to template_url.* in http://crrev.com/178755. BUG=170390 R=dhollowa@chromium.org,pkasting@chromium.org,sky@chromium.org TEST=none; no visible changes. Review URL: https://chromiumcodereview.appspot.com/12250033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182381 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/browser_instant_controller.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'chrome/browser/ui/browser_instant_controller.cc') diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 4cdc6d4..9d92283 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -83,23 +83,21 @@ void BrowserInstantController::RegisterUserPrefs( registry->RegisterBooleanPref(prefs::kInstantEnabled, false, PrefRegistrySyncable::SYNCABLE_PREF); - search::InstantExtendedDefault instant_extended_default_setting = - search::GetInstantExtendedDefaultSetting(); - - bool instant_extended_value = true; - switch (instant_extended_default_setting) { - case search::INSTANT_FORCE_ON: + bool instant_extended_default = true; + switch (search::GetInstantExtendedDefaultSetting()) { + case search::INSTANT_DEFAULT_ON: + instant_extended_default = true; break; case search::INSTANT_USE_EXISTING: - instant_extended_value = prefs->GetBoolean(prefs::kInstantEnabled); + instant_extended_default = prefs->GetBoolean(prefs::kInstantEnabled); break; - case search::INSTANT_FORCE_OFF: - instant_extended_value = false; + case search::INSTANT_DEFAULT_OFF: + instant_extended_default = false; break; } registry->RegisterBooleanPref(prefs::kInstantExtendedEnabled, - instant_extended_value, + instant_extended_default, PrefRegistrySyncable::SYNCABLE_PREF); } -- cgit v1.1