mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/shelf_item.h"
+#include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "base/auto_reset.h"
 #include "chrome/browser/ui/app_icon_loader.h"
 #include "chrome/browser/ui/app_icon_loader_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
 class AccountId;
 class ArcAppDeferredLauncherController;
 class BrowserShortcutLauncherItemController;
 class GURL;
 class LauncherControllerHelper;
 
 namespace ash {
@@ skipping 38 matching lines @@
   LauncherControllerHelper* launcher_controller_helper() {
     return launcher_controller_helper_.get();
   }
 
   ~ChromeLauncherController() override;
 
   // Initializes this ChromeLauncherController and calls OnInit.
   void Init();
 
   // Creates a new app item on the shelf for |controller|.
-  virtual ash::ShelfID CreateAppLauncherItem(LauncherItemController* controller,
+  virtual ash::ShelfID CreateAppLauncherItem(ash::ShelfItemDelegate* controller,

[James Cook, 2017/04/04 15:34:45]

kinda weird that these item delegates are named "controller". Maybe
item_delegate?

[msw, 2017/04/04 18:53:09]

Done.

                                              ash::ShelfItemStatus status) = 0;
 
   // Returns the shelf item with the given id, or null if |id| isn't found.
   virtual const ash::ShelfItem* GetItem(ash::ShelfID id) const = 0;
 
   // Updates the type of an item.
   virtual void SetItemType(ash::ShelfID id, ash::ShelfItemType type) = 0;
 
   // Updates the running status of an item. It will also update the status of
   // browsers shelf item if needed.
   virtual void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) = 0;
 
   // Updates the controller associated with id (which should be a shortcut).
   // Takes ownership of |controller|.
   // TODO(skuhne): Pass in scoped_ptr to make ownership clear.

[James Cook, 2017/04/04 15:34:45]

Is now a good time to resolve this TODO?

[msw, 2017/04/04 18:53:09]

Done, but what a pain... this wasn't simple.

[James Cook, 2017/04/04 23:57:26]

Thanks for doing it.

   virtual void SetItemController(ash::ShelfID id,
-                                 LauncherItemController* controller) = 0;
+                                 ash::ShelfItemDelegate* controller) = 0;
 
   // Closes or unpins the shelf item.
   virtual void CloseLauncherItem(ash::ShelfID id) = 0;
 
   // Returns true if the item identified by |id| is pinned.
   virtual bool IsPinned(ash::ShelfID id) = 0;
 
   // Set the shelf item status for the V1 application with the given |app_id|.
   // Adds or removes an item as needed to respect the running and pinned state.
   virtual void SetV1AppStatus(const std::string& app_id,
@@ skipping 52 matching lines @@
       ui::BaseWindow* window,
       bool allow_minimize) = 0;
 
   // Called when the active user has changed.
   virtual void ActiveUserChanged(const std::string& user_email) = 0;
 
   // Called when a user got added to the session.
   virtual void AdditionalUserAddedToSession(Profile* profile) = 0;
 
   // Get the list of all running incarnations of this item.
-  virtual MenuItemList GetAppMenuItemsForTesting(
+  virtual ash::MenuItemList GetAppMenuItemsForTesting(
       const ash::ShelfItem& item) = 0;
 
   // Get the list of all tabs which belong to a certain application type.
   virtual std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
       const std::string& app_id) = 0;
 
   // Activates a specified shell application by app id and window index.
   virtual void ActivateShellApp(const std::string& app_id,
                                 int window_index) = 0;
 
@@ skipping 12 matching lines @@
   // Note that for incognito windows the incognito icon will be returned.
   // If |web_contents| has not loaded, returns the default favicon.
   virtual gfx::Image GetAppListIcon(
       content::WebContents* web_contents) const = 0;
 
   // Get the title for the applicatoin list entry for |web_contents|.
   // If |web_contents| has not loaded, returns "Net Tab".
   virtual base::string16 GetAppListTitle(
       content::WebContents* web_contents) const = 0;
 
-  // Returns the LauncherItemController of BrowserShortcut.
+  // Returns the ash::ShelfItemDelegate of BrowserShortcut.
   virtual BrowserShortcutLauncherItemController*
   GetBrowserShortcutLauncherItemController() = 0;
 
-  virtual LauncherItemController* GetLauncherItemController(
+  virtual ash::ShelfItemDelegate* GetLauncherItemController(

[James Cook, 2017/04/04 15:34:45]

Likewise, continuing to call this GetLauncherItemController() is weird. This
needs to be renamed, either in this CL or a followup.

[msw, 2017/04/04 18:53:09]

Done. Sadly, these renames take time...

       const ash::ShelfID id) = 0;
 
   // Check if the shelf visibility (location, visibility) will change with a new
   // user profile or not. However, since the full visibility calculation of the
   // shelf cannot be performed here, this is only a probability used for
   // animation predictions.
   virtual bool ShelfBoundsChangesProbablyWithUser(
       ash::WmShelf* shelf,
       const AccountId& account_id) const = 0;
 
@@ skipping 84 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_