Revert of AutoHide Behavior

ash/launcher/launcher_context_menu.cc

Index: ash/launcher/launcher_context_menu.cc
diff --git a/ash/launcher/launcher_context_menu.cc b/ash/launcher/launcher_context_menu.cc
index f2ea498aabd77ec28b2b85208e7995979177ac92..0b307dcfff3a3433533cdec07caf4d4eba398911 100644
--- a/ash/launcher/launcher_context_menu.cc
+++ b/ash/launcher/launcher_context_menu.cc
@@ -25,19 +25,38 @@ LauncherContextMenu::~LauncherContextMenu() {
 
 // static
 bool LauncherContextMenu::IsAutoHideMenuHideChecked() {
-  return ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS ==
+  internal::RootWindowController* controller =
+      Shell::GetPrimaryRootWindowController();
+  ash::ShelfAutoHideBehavior auto_hide_behavior =
       Shell::GetInstance()->GetShelfAutoHideBehavior();
+  return (controller->IsInMaximizedMode() &&
+          (auto_hide_behavior == ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT ||
+           auto_hide_behavior == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS)) ||
+      (!controller->IsInMaximizedMode() &&
+       auto_hide_behavior == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 }
 
 // static
 ShelfAutoHideBehavior LauncherContextMenu::GetToggledAutoHideBehavior() {
-  return IsAutoHideMenuHideChecked() ? ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER :
-      ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
+  ash::ShelfAutoHideBehavior auto_hide_behavior;
+  if (Shell::GetPrimaryRootWindowController()->IsInMaximizedMode()) {
+    if (IsAutoHideMenuHideChecked())
+      auto_hide_behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
+    else
+      auto_hide_behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT;
+  } else if (IsAutoHideMenuHideChecked()) {
+    auto_hide_behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT;
+  } else {
+    auto_hide_behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
+  }
+  return auto_hide_behavior;
 }
 
 // static
 int LauncherContextMenu::GetAutoHideResourceStringId() {
-  return IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE;
+  return Shell::GetPrimaryRootWindowController()->IsInMaximizedMode() ?
+      IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE_MAXIMIZED :
+      IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE_NOT_MAXIMIZED;
 }
 
 bool LauncherContextMenu::IsCommandIdChecked(int command_id) const {