Use mojo Shelf interfaces for both mash and classic ash.

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/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
-#include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/strings/grit/ash_strings.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "build/build_config.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
@@ skipping 21 matching lines @@
     const ash::ShelfItem* item,
     ash::WmShelf* wm_shelf) {
   DCHECK(controller);
   DCHECK(wm_shelf);
   // Create DesktopShellLauncherContextMenu if no item is selected.
   if (!item || item->id == 0)
     return new DesktopShellLauncherContextMenu(controller, item, wm_shelf);
 
   // Create ArcLauncherContextMenu if the item is an Arc app.
   const std::string& app_id = controller->GetAppIDForShelfID(item->id);
-  ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(controller->GetProfile());
+  ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(controller->profile());
   if (arc_prefs && arc_prefs->IsRegistered(app_id))
     return new ArcLauncherContextMenu(controller, item, wm_shelf);
 
   // Create ExtensionLauncherContextMenu for the item.
   return new ExtensionLauncherContextMenu(controller, item, wm_shelf);
 }
 
 LauncherContextMenu::LauncherContextMenu(
     ChromeLauncherControllerImpl* controller,
     const ash::ShelfItem* item,
@@ skipping 29 matching lines @@
 
 bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case MENU_PIN:
       return controller_->IsPinnable(item_.id);
     case MENU_CHANGE_WALLPAPER:
       return ash::WmShell::Get()
           ->wallpaper_delegate()
           ->CanOpenSetWallpaperPage();
     case MENU_AUTO_HIDE:
-      return CanUserModifyShelfAutoHideBehavior(controller_->GetProfile());
+      return CanUserModifyShelfAutoHideBehavior(controller_->profile());
     default:
       DCHECK(command_id < MENU_ITEM_COUNT);
       return true;
   }
 }
 
 void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {
   switch (static_cast<MenuItem>(command_id)) {
     case MENU_OPEN_NEW:
       controller_->Launch(item_.id, ui::EF_NONE);
@@ skipping 29 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 void LauncherContextMenu::AddPinMenu() {
   // Expect an item with a none zero id to add pin/unpin menu item.
   DCHECK(item_.id);
   int menu_pin_string_id;
   const std::string app_id = controller_->GetAppIDForShelfID(item_.id);
-  switch (GetPinnableForAppID(app_id, controller_->GetProfile())) {
+  switch (GetPinnableForAppID(app_id, controller_->profile())) {
     case AppListControllerDelegate::PIN_EDITABLE:
       menu_pin_string_id = controller_->IsPinned(item_.id)
                                ? IDS_LAUNCHER_CONTEXT_MENU_UNPIN
                                : IDS_LAUNCHER_CONTEXT_MENU_PIN;
       break;
     case AppListControllerDelegate::PIN_FIXED:
       menu_pin_string_id = IDS_LAUNCHER_CONTEXT_MENU_PIN_ENFORCED_BY_POLICY;
       break;
     case AppListControllerDelegate::NO_PIN:
       return;
     default:
       NOTREACHED();
       return;
   }
   AddItemWithStringId(MENU_PIN, menu_pin_string_id);
 }
 
 void LauncherContextMenu::AddShelfOptionsMenu() {
   // In fullscreen, the launcher is either hidden or autohidden depending
   // on thethe type of fullscreen. Do not show the auto-hide menu item while in
   // while in fullscreen because it is confusing when the preference appears
   // not to apply.
   if (!IsFullScreenMode() &&
-      CanUserModifyShelfAutoHideBehavior(controller_->GetProfile())) {
+      CanUserModifyShelfAutoHideBehavior(controller_->profile())) {
     AddCheckItemWithStringId(MENU_AUTO_HIDE,
                              IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
   }
-  if (ash::ShelfWidget::ShelfAlignmentAllowed() &&
+  if (ash::WmShelf::CanChangeShelfAlignment() &&
       !ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked()) {
     AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
                            IDS_ASH_SHELF_CONTEXT_MENU_POSITION,
                            &shelf_alignment_menu_);
   }
-  if (!controller_->GetProfile()->IsGuestSession())
+  if (!controller_->profile()->IsGuestSession())
     AddItemWithStringId(MENU_CHANGE_WALLPAPER, IDS_AURA_SET_DESKTOP_WALLPAPER);
 }
 
 bool LauncherContextMenu::ExecuteCommonCommand(int command_id,
                                                int event_flags) {
   switch (command_id) {
     case MENU_OPEN_NEW:
     case MENU_CLOSE:
     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;
   }
 }