ash: Move shelf alignment and auto-hide calls from Shell to Shelf

chrome/browser/ui/ash/launcher/launcher_context_menu.cc

 // Copyright 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 "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include <string>
 
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 64 matching lines @@
 bool LauncherContextMenu::IsItemForCommandIdDynamic(int command_id) const {
   return false;
 }
 
 base::string16 LauncherContextMenu::GetLabelForCommandId(int command_id) const {
   NOTREACHED();
   return base::string16();
 }
 
 bool LauncherContextMenu::IsCommandIdChecked(int command_id) const {
-  if (command_id == MENU_AUTO_HIDE) {
-    return shelf_->GetAutoHideBehavior() ==
-           ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
-  }
+  if (command_id == MENU_AUTO_HIDE)
+    return shelf_->auto_hide_behavior() == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
   DCHECK(command_id < MENU_ITEM_COUNT);
   return false;
 }
 
 bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case MENU_PIN:
       return controller_->IsPinnable(item_.id);
     case MENU_CHANGE_WALLPAPER:
       return ash::Shell::GetInstance()
@@ skipping 30 matching lines @@
         // TODO(simonhong): Use ShelfItemDelegate::Close().
         controller_->Close(item_.id);
       }
       ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
           ash::UMA_CLOSE_THROUGH_CONTEXT_MENU);
       break;
     case MENU_PIN:
       controller_->TogglePinned(item_.id);
       break;
     case MENU_AUTO_HIDE:
-      shelf_->SetAutoHideBehavior(shelf_->GetAutoHideBehavior() ==
+      shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() ==
                                           ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
                                       ? ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER
                                       : ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
       break;
     case MENU_ALIGNMENT_MENU:
       break;
     case MENU_CHANGE_WALLPAPER:
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           OpenSetWallpaperPage();
       break;
@@ skipping 53 matching lines @@
     case MENU_PIN:
     case MENU_AUTO_HIDE:
     case MENU_ALIGNMENT_MENU:
     case MENU_CHANGE_WALLPAPER:
       LauncherContextMenu::ExecuteCommand(command_id, event_flags);
       return true;
     default:
       return false;
   }
 }