commit 48e67ee77c88640b9de4a9bdad7b56502ec00487
author kcarattini@chromium.org <kcarattini@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 01 06:53:43 2014
committer kcarattini@chromium.org <kcarattini@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 01 06:53:43 2014
tree 53337322d35668bd0693eaf583e9a10d86c33893
parent 14c362f754194bce8565ebc7362f0ef205716129

Adds a flag to enable the OK Google voice search activation setting.

BUG=390086
NOTRY=true

Review URL: https://codereview.chromium.org/348943003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280757 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/about_flags.cc

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f4e18b9..180cc40 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1946,6 +1946,15 @@
         data_reduction_proxy::switches::kDisableDataReductionProxyDev)
   },
 #endif
+#if defined(OS_CHROMEOS)
+  {
+    "enable-ok-google-voice-search",
+    IDS_FLAGS_OK_GOOGLE_NAME,
+    IDS_FLAGS_OK_GOOGLE_DESCRIPTION,
+    kOsCrOS,
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableOkGoogleVoiceSearch)
+  },
+#endif
 };
 
 const Experiment* experiments = kExperiments;