diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 00:37:35 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 00:37:35 +0000 |
| commit | 62018dc7d9d5950bb6f266de2e2a687431e0c5f8 (patch) | |
| tree | 48df1f076b06464ddd5c9c0fedf96f2c2a8a1611 | |
| parent | ae716f0b66e9b6660f35bbe0fffd48c0e71e47c9 (diff) | |
| download | chromium_src-62018dc7d9d5950bb6f266de2e2a687431e0c5f8.zip chromium_src-62018dc7d9d5950bb6f266de2e2a687431e0c5f8.tar.gz chromium_src-62018dc7d9d5950bb6f266de2e2a687431e0c5f8.tar.bz2 | |
Add option to enable launchers per diplay in flags page.
BUG=145978
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11527004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172727 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 5904068..4c745aa 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6992,6 +6992,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION" desc="Description for the flag to switch lock animations."> Enables new lock animations. </message> + <message name="IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_NAME" desc="Name for the flag to enable launchers on all displays."> + Enables launcher on all displays. + </message> + <message name="IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_DESCRIPTION" desc="Description for the flag to enable launchers on all displaysj."> + All displays will have a launcher when enabled. + </message> </if> <message name="IDS_FLAGS_OLD_CHECKBOX_STYLE" desc="Name of the flag to turn off the new checkbox style."> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index c0d8a99..503fab0 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -955,7 +955,14 @@ const Experiment kExperiments[] = { kOsCrOS, SINGLE_VALUE_TYPE(switches::kEnableChromebookFunctionKey), }, -#endif + { + "enable-launcher-per-display", + IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_NAME, + IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_DESCRIPTION, + kOsCrOS, + SINGLE_VALUE_TYPE(ash::switches::kAshLauncherPerDisplay), + }, +#endif // defined(OS_CHROMEOS) { "enable-views-textfield", IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, |