Adding ChromeLauncherController interface.

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

Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index e4b63aabc88c768381865214e30acd004809bd60..bf3b835ea8e986be368ba82b5d0bba5aa950cf00 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -17,7 +17,7 @@
 #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.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
 #include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"
 #include "chrome/common/pref_names.h"
@@ -39,7 +39,7 @@ bool CanUserModifyShelfAutoHideBehavior(const Profile* profile) {
 
 // static
 LauncherContextMenu* LauncherContextMenu::Create(
-    ChromeLauncherController* controller,
+    ChromeLauncherControllerImpl* controller,
     const ash::ShelfItem* item,
     ash::WmShelf* wm_shelf) {
   DCHECK(controller);
@@ -50,7 +50,7 @@ LauncherContextMenu* LauncherContextMenu::Create(
 
   // Create ArcLauncherContextMenu if the item is an Arc app.
   const std::string& app_id = controller->GetAppIDForShelfID(item->id);

[msw, 2016/06/10 22:44:39]

Can this instead call
ash::Shell::GetInstance()->GetShelfDelegate()->GetAppIDForShelfID(), and then
can LauncherContextMenu and its subclasses take a pointer to the
ChromeLauncherController interface, or is there some other reason that launcher
context menus need pointers to the impl subclass?

[mfomitchev, 2016/06/10 23:29:09]

Yeah, that's what I tried to do at first. Problem is, this gets exercised by
unit tests (ChromeLauncherControllerTest, LauncherContextMenuTest) which create
their own  ChromeLauncherController instances that different from
ash::Shell::GetShelfDelegate(), and then the tests fail if we use
ash::Shell::GetShelfDelegate() here. 

I suppose we could rewrite the tests, but I think we can't use
LauncherContextMenu for Mash as-is anyway, so I think we can address this in a
follow-up CL once the usage of LauncherContextMenu becomes more clear.

[msw, 2016/06/10 23:42:51]

Acknowledged.

-  ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(controller->profile());
+  ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(controller->GetProfile());
   if (arc_prefs && arc_prefs->IsRegistered(app_id))
     return new ArcLauncherContextMenu(controller, item, wm_shelf);
 
@@ -58,9 +58,10 @@ LauncherContextMenu* LauncherContextMenu::Create(
   return new ExtensionLauncherContextMenu(controller, item, wm_shelf);
 }
 
-LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
-                                         const ash::ShelfItem* item,
-                                         ash::WmShelf* wm_shelf)
+LauncherContextMenu::LauncherContextMenu(
+    ChromeLauncherControllerImpl* controller,
+    const ash::ShelfItem* item,
+    ash::WmShelf* wm_shelf)
     : ui::SimpleMenuModel(nullptr),
       controller_(controller),
       item_(item ? *item : ash::ShelfItem()),
@@ -99,7 +100,7 @@ bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const {
           ->user_wallpaper_delegate()
           ->CanOpenSetWallpaperPage();
     case MENU_AUTO_HIDE:
-      return CanUserModifyShelfAutoHideBehavior(controller_->profile());
+      return CanUserModifyShelfAutoHideBehavior(controller_->GetProfile());
     default:
       DCHECK(command_id < MENU_ITEM_COUNT);
       return true;
@@ -182,7 +183,7 @@ void LauncherContextMenu::AddShelfOptionsMenu() {
   // while in fullscreen because it is confusing when the preference appears
   // not to apply.
   if (!IsFullScreenMode() &&
-      CanUserModifyShelfAutoHideBehavior(controller_->profile())) {
+      CanUserModifyShelfAutoHideBehavior(controller_->GetProfile())) {
     AddCheckItemWithStringId(MENU_AUTO_HIDE,
                              IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
   }
@@ -192,7 +193,7 @@ void LauncherContextMenu::AddShelfOptionsMenu() {
                            IDS_ASH_SHELF_CONTEXT_MENU_POSITION,
                            &shelf_alignment_menu_);
   }
-  if (!controller_->profile()->IsGuestSession())
+  if (!controller_->GetProfile()->IsGuestSession())
     AddItemWithStringId(MENU_CHANGE_WALLPAPER, IDS_AURA_SET_DESKTOP_WALLPAPER);
 }