ash: Fix shelf auto hide behavior not persisted regression.

ash/launcher/launcher_context_menu.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_context_menu.h"
 
 #include "ash/shell.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 13 matching lines @@
   ash::ShelfAutoHideBehavior auto_hide_behavior =
       shell->GetShelfAutoHideBehavior();
   return (shell->IsInMaximizedMode() &&
           (auto_hide_behavior == ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT ||
            auto_hide_behavior == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS)) ||
       (!shell->IsInMaximizedMode() &&
        auto_hide_behavior == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 }
 
 // static
-void LauncherContextMenu::ToggleAutoHideMenu() {
+ShelfAutoHideBehavior LauncherContextMenu::GetToggledAutoHideBehavior() {
   ash::Shell* shell = ash::Shell::GetInstance();
   ash::ShelfAutoHideBehavior auto_hide_behavior;
   if (shell->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;
   }
-  shell->SetShelfAutoHideBehavior(auto_hide_behavior);
+  return auto_hide_behavior;
 }
 
 // static
 int LauncherContextMenu::GetAutoHideResourceStringId() {
   return ash::Shell::GetInstance()->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 {
@@ skipping 11 matching lines @@
 
 bool LauncherContextMenu::GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) {
   return false;
 }
 
 void LauncherContextMenu::ExecuteCommand(int command_id) {
   switch (static_cast<MenuItem>(command_id)) {
     case MENU_AUTO_HIDE:
-      ToggleAutoHideMenu();
+      ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
+          GetToggledAutoHideBehavior());
       break;
   }
 }
 
 }  // namespace ash