Merge 190665 "Revert (187020) side launcher enabled by default f..."

> Revert (187020) side launcher enabled by default for M27
> Top option still removed.
> 
> (reviewed https://codereview.chromium.org/12929035/, had to duplicate because of svn issue)
> 
> TBR=jamescook@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/13070005

TBR=harrym@chromium.org
Review URL: https://codereview.chromium.org/13365003

git-svn-id: svn://svn.chromium.org/chrome/branches/1453/src@191467 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 18 insertions, 18 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b8b5ff0..5bbc6f2 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6797,11 +6797,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION" desc="Description for the flag to disable the tab discarding feature.">
         Turns off tab discarding, a feature that discards infrequently used tabs under low memory conditions.
       </message>
-      <message name="IDS_FLAGS_HIDE_LAUNCHER_ALIGNMENT_MENU_NAME" desc="Name for the flag to hide the menu that lets you change the alignment of the launcher.">
-        Hide launcher alignment menu.
+      <message name="IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME" desc="Name for the flag to show a menu that lets you change the alignment of the launcher.">
+        Show launcher alignment menu.
       </message>
-      <message name="IDS_FLAGS_HIDE_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION" desc="Description for the flag to hide the menu that lets you change the alignment of the launcher.">
-        Remove the menu that allows changing the side the launcher is aligned to.
+      <message name="IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION" desc="Description for the flag to show a menu that lets you change the alignment of the launcher.">
+        Enables a menu that allows changing the side the launcher is aligned to.
       </message>
 
       <message name="IDS_FLAGS_SHOW_TOUCH_HUD_NAME" desc="Name for the flag to show a heads-up display for tracking touch-points.">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ea07674..3d99a89 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -924,11 +924,11 @@ const Experiment kExperiments[] = {
   },
 #if defined(USE_ASH)
   {
-    "hide-launcher-alignment-menu",
-    IDS_FLAGS_HIDE_LAUNCHER_ALIGNMENT_MENU_NAME,
-    IDS_FLAGS_HIDE_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
+    "show-launcher-alignment-menu",
+    IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME,
+    IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE(switches::kHideLauncherAlignmentMenu)
+    SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
   },
   {
     "show-touch-hud",
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
index 872d591..ceb0858 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
@@ -1409,8 +1409,8 @@ void ChromeLauncherControllerPerApp::SetShelfAutoHideBehaviorFromPrefs() {
 }
 
 void ChromeLauncherControllerPerApp::SetShelfAlignmentFromPrefs() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kHideLauncherAlignmentMenu))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kShowLauncherAlignmentMenu))
     return;
 
   ash::Shell::RootWindowList root_windows;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
index 61095ff..78c7d14 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
@@ -1234,8 +1234,8 @@ void ChromeLauncherControllerPerBrowser::SetShelfAutoHideBehaviorFromPrefs() {
 }
 
 void ChromeLauncherControllerPerBrowser::SetShelfAlignmentFromPrefs() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kHideLauncherAlignmentMenu))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kShowLauncherAlignmentMenu))
     return;
 
   ash::Shell::RootWindowList root_windows;
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index beac9f0..0907b5e 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -142,8 +142,8 @@ void LauncherContextMenu::Init() {
     AddCheckItemWithStringId(
         MENU_AUTO_HIDE, IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE);
   }
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kHideLauncherAlignmentMenu)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kShowLauncherAlignmentMenu)) {
     AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
                            IDS_AURA_LAUNCHER_CONTEXT_MENU_POSITION,
                            &launcher_alignment_menu_);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 5b19d64..83b40b9 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -728,9 +728,6 @@ const char kHelpShort[]                     = "h";
 // it.
 const char kHideIcons[]                     = "hide-icons";
 
-// If false the alignment of the launcher can be changed.
-const char kHideLauncherAlignmentMenu[]     = "hide-launcher-alignment-menu";
-
 // Disables full history sync.
 const char kHistoryDisableFullHistorySync[]      = "disable-full-history-sync";
 
@@ -1239,6 +1236,9 @@ const char kShowComponentExtensionOptions[] =
 // See kHideIcons.
 const char kShowIcons[]                     = "show-icons";
 
+// If true the alignment of the launcher can be changed.
+const char kShowLauncherAlignmentMenu[]     = "show-launcher-alignment-menu";
+
 // Marks a renderer as the signin process.
 const char kSigninProcess[]                 = "signin-process";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 0b1fdbf..69d9bd1 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -206,7 +206,6 @@ extern const char kGSSAPILibraryName[];
 extern const char kHelp[];
 extern const char kHelpShort[];
 extern const char kHideIcons[];
-extern const char kHideLauncherAlignmentMenu[];
 extern const char kHistoryDisableFullHistorySync[];
 extern const char kHistoryEnableFullHistorySync[];
 extern const char kHistoryEnableGroupByDomain[];
@@ -330,6 +329,7 @@ extern const char kSetToken[];
 extern const char kShowAppList[];
 extern const char kShowComponentExtensionOptions[];
 extern const char kShowIcons[];
+extern const char kShowLauncherAlignmentMenu[];
 extern const char kSigninProcess[];
 extern const char kSilentDumpOnDCHECK[];
 extern const char kSimulateUpgrade[];