summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 16:35:19 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 16:35:19 +0000
commit8a6ff28d37e1010ef77251f232ba5008b28ddc97 (patch)
treedf509f80047be1cc3dc08971361c071e7ff47b47 /chrome/browser/instant
parentc25108500d8b37f8e8fe194070e99eb8550cc9a5 (diff)
downloadchromium_src-8a6ff28d37e1010ef77251f232ba5008b28ddc97.zip
chromium_src-8a6ff28d37e1010ef77251f232ba5008b28ddc97.tar.gz
chromium_src-8a6ff28d37e1010ef77251f232ba5008b28ddc97.tar.bz2
Adds ability for about:flags to use a select for choosing one of many
values, and wires this up for instant. BUG=none TEST=none Review URL: http://codereview.chromium.org/5451003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
-rw-r--r--chrome/browser/instant/instant_controller.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index fcc55f9..8a71266 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -514,8 +514,10 @@ bool InstantController::GetType(Profile* profile, Type* type) {
*type = VERBATIM_TYPE;
return true;
}
-
- // There is no switch for PREDICTIVE_NO_AUTO_COMPLETE_TYPE.
+ if (cl->HasSwitch(switches::kEnablePredictiveNoAutoCompleteInstant)) {
+ *type = PREDICTIVE_NO_AUTO_COMPLETE_TYPE;
+ return true;
+ }
// Then prefs.
PrefService* prefs = profile->GetPrefs();