diff options
-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, |