diff options
| author | vlaviano@chromium.org <vlaviano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 02:49:44 +0000 |
|---|---|---|
| committer | vlaviano@chromium.org <vlaviano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 02:49:44 +0000 |
| commit | cd681c453a82ab32086917f92884a5072cda46ae (patch) | |
| tree | d3a032ed8ff713304385fed81a8718d0ee4b50e9 /chrome | |
| parent | bb5a5a7d106cd756ab0ab96adf95d774fed32657 (diff) | |
| download | chromium_src-cd681c453a82ab32086917f92884a5072cda46ae.zip chromium_src-cd681c453a82ab32086917f92884a5072cda46ae.tar.gz chromium_src-cd681c453a82ab32086917f92884a5072cda46ae.tar.bz2 | |
Add Chrome OS bluetooth lab to about:flags
BUG=chromium-os:16752
TEST=View about:flags page
Change-Id: Ia5850ab7610005a328325facda1a1b5535733120
Review URL: http://codereview.chromium.org/8070014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 92cc554..e069e47 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4309,6 +4309,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_DISABLE_VIEWS_DESKTOP_DESCRIPTION" desc="Description of the 'Disable desktop' lab."> Uses the Views Desktop environment for Chrome. </message> + <message name="IDS_FLAGS_ENABLE_BLUETOOTH_NAME" desc="Name of the 'Bluetooth' lab."> + Bluetooth + </message> + <message name="IDS_FLAGS_ENABLE_BLUETOOTH_DESCRIPTION" desc="Description of the 'Bluetooth' lab."> + Enable Chrome OS Bluetooth support. + </message> <message name="IDS_FLAGS_MEMORY_WIDGET_NAME" desc="Name of the 'Show memory status' lab."> Show memory status </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index e60d80f..08c5840 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -378,6 +378,13 @@ const Experiment kExperiments[] = { kOsCrOS, SINGLE_VALUE_TYPE(switches::kEnableArchives) }, + { + "enable-bluetooth", + IDS_FLAGS_ENABLE_BLUETOOTH_NAME, + IDS_FLAGS_ENABLE_BLUETOOTH_DESCRIPTION, + kOsCrOS, + SINGLE_VALUE_TYPE(switches::kEnableBluetooth) + }, #endif { "memory-widget", diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 28b9076..046f0ff 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1046,6 +1046,9 @@ const char kWebUILogin[] = "webui-login"; // Skips OAuth part of ChromeOS login process. const char kSkipOAuthLogin[] = "skip-oauth-login"; +// Enables bluetooth support on ChromeOS +const char kEnableBluetooth[] = "enable-bluetooth"; + // Enables device policy support on ChromeOS. const char kEnableDevicePolicy[] = "enable-device-policy"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index f82923e..c70be78 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -285,6 +285,7 @@ extern const char kWinHttpProxyResolver[]; #if defined(OS_CHROMEOS) extern const char kWebUILogin[]; extern const char kSkipOAuthLogin[]; +extern const char kEnableBluetooth[]; extern const char kEnableDevicePolicy[]; extern const char kEnableGView[]; extern const char kEnableLoginImages[]; |