Use mojo Shelf interfaces for both mash and classic ash.

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

 // Copyright 2016 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/extension_launcher_context_menu.h"
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
@@ skipping 21 matching lines @@
     const ash::ShelfItem* item,
     ash::WmShelf* wm_shelf)
     : LauncherContextMenu(controller, item, wm_shelf) {
   Init();
 }
 
 ExtensionLauncherContextMenu::~ExtensionLauncherContextMenu() {}
 
 void ExtensionLauncherContextMenu::Init() {
   extension_items_.reset(new extensions::ContextMenuMatcher(
-      controller()->GetProfile(), this, this,
+      controller()->profile(), this, this,
       base::Bind(MenuItemHasLauncherContext)));
   if (item().type == ash::TYPE_APP_SHORTCUT ||
       item().type == ash::TYPE_WINDOWED_APP) {
     // V1 apps can be started from the menu - but V2 apps should not.
     if (!controller()->IsPlatformApp(item().id)) {
       AddItem(MENU_OPEN_NEW, base::string16());
       AddSeparator(ui::NORMAL_SEPARATOR);
     }
     AddPinMenu();
     if (controller()->IsOpen(item().id))
@@ skipping 16 matching lines @@
         AddCheckItemWithStringId(LAUNCH_TYPE_WINDOW,
                                  IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
         // Even though the launch type is Full Screen it is more accurately
         // described as Maximized in Ash.
         AddCheckItemWithStringId(LAUNCH_TYPE_FULLSCREEN,
                                  IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
       }
     }
   } else if (item().type == ash::TYPE_BROWSER_SHORTCUT) {
     AddItemWithStringId(MENU_NEW_WINDOW, IDS_APP_LIST_NEW_WINDOW);
-    if (!controller()->GetProfile()->IsGuestSession()) {
+    if (!controller()->profile()->IsGuestSession()) {
       AddItemWithStringId(MENU_NEW_INCOGNITO_WINDOW,
                           IDS_APP_LIST_NEW_INCOGNITO_WINDOW);
     }
     if (!BrowserShortcutLauncherItemController(
              controller(), ash::WmShell::Get()->shelf_model())
              .IsListOfActiveBrowserEmpty()) {
       AddItem(MENU_CLOSE,
               l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
     }
   } else if (item().type == ash::TYPE_DIALOG) {
@@ skipping 72 matching lines @@
       return (extension_items_ &&
               extension_items_->IsCommandIdChecked(command_id));
   }
 }
 
 bool ExtensionLauncherContextMenu::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case MENU_NEW_WINDOW:
       // "Normal" windows are not allowed when incognito is enforced.
       return IncognitoModePrefs::GetAvailability(
-                 controller()->GetProfile()->GetPrefs()) !=
+                 controller()->profile()->GetPrefs()) !=
              IncognitoModePrefs::FORCED;
     case MENU_NEW_INCOGNITO_WINDOW:
       // Incognito windows are not allowed when incognito is disabled.
       return IncognitoModePrefs::GetAvailability(
-                 controller()->GetProfile()->GetPrefs()) !=
+                 controller()->profile()->GetPrefs()) !=
              IncognitoModePrefs::DISABLED;
     default:
       if (command_id < MENU_ITEM_COUNT)
         return LauncherContextMenu::IsCommandIdEnabled(command_id);
       return (extension_items_ &&
               extension_items_->IsCommandIdEnabled(command_id));
   }
 }
 
 void ExtensionLauncherContextMenu::ExecuteCommand(int command_id,
@@ skipping 18 matching lines @@
                           : extensions::LAUNCH_TYPE_WINDOW;
       }
       controller()->SetLaunchType(item().id, launch_type);
       break;
     }
     case LAUNCH_TYPE_FULLSCREEN:
       controller()->SetLaunchType(item().id,
                                   extensions::LAUNCH_TYPE_FULLSCREEN);
       break;
     case MENU_NEW_WINDOW:
-      chrome::NewEmptyWindow(controller()->GetProfile());
+      chrome::NewEmptyWindow(controller()->profile());
       break;
     case MENU_NEW_INCOGNITO_WINDOW:
-      chrome::NewEmptyWindow(
-          controller()->GetProfile()->GetOffTheRecordProfile());
+      chrome::NewEmptyWindow(controller()->profile()->GetOffTheRecordProfile());
       break;
     default:
       if (extension_items_) {
         extension_items_->ExecuteCommand(command_id, nullptr, nullptr,
                                          content::ContextMenuParams());
       }
   }
 }