diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 19:15:43 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 19:15:43 +0000 |
| commit | a1a83ef65ea603464ec8c7f39ba9b9543b4bb19e (patch) | |
| tree | a9aa7096519400d9212ece1c10817ca3310806ba /chrome/browser/ui/browser_instant_controller.cc | |
| parent | 670075650836296e023acf7bd77383fefc08e493 (diff) | |
| download | chromium_src-a1a83ef65ea603464ec8c7f39ba9b9543b4bb19e.zip chromium_src-a1a83ef65ea603464ec8c7f39ba9b9543b4bb19e.tar.gz chromium_src-a1a83ef65ea603464ec8c7f39ba9b9543b4bb19e.tar.bz2 | |
Disable Instant when suggest is disabled.
BUG=176152
COLLABORATOR=sreeram@chromium.org
R=samarth@chromium.org
TEST=Disable suggest, notice that Instant results stop appearing.
Review URL: https://chromiumcodereview.appspot.com/14148003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_instant_controller.cc')
| -rw-r--r-- | chrome/browser/ui/browser_instant_controller.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index c689ce1..3031655 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -241,12 +241,11 @@ void BrowserInstantController::ResetInstant(const std::string& pref_name) { if (pref_name == prefs::kInstantEnabled) chrome::SetInstantExtendedPrefDefault(profile()); - bool instant_pref_enabled = chrome::IsInstantPrefEnabled(profile()); - bool use_local_overlay_only = profile()->IsOffTheRecord() || + bool instant_checkbox_checked = chrome::IsInstantCheckboxChecked(profile()); + bool use_local_overlay_only = chrome::IsLocalOnlyInstantExtendedAPIEnabled() || - (!instant_pref_enabled && - !profile()->GetPrefs()->GetBoolean(prefs::kSearchSuggestEnabled)); - instant_.SetInstantEnabled(instant_pref_enabled, use_local_overlay_only); + !chrome::IsInstantCheckboxEnabled(profile()); + instant_.SetInstantEnabled(instant_checkbox_checked, use_local_overlay_only); } //////////////////////////////////////////////////////////////////////////////// |