| Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
|
| index e6acc26f52d4e6a8855a1c374722a3bce35e1cf2..6806d5f049767fdf0794d654aaae4a9a080a6ce9 100644
|
| --- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h
|
| @@ -85,18 +85,19 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
|
|
|
| private:
|
| class AppWindow;
|
| + class AppWindowInfo;
|
|
|
| - using TaskIdToAppWindow = std::map<int, std::unique_ptr<AppWindow>>;
|
| - using TaskIdToShelfAppIdMap = std::map<int, std::string>;
|
| - using AppControllerMap =
|
| + using TaskIdToAppWindowInfo = std::map<int, std::unique_ptr<AppWindowInfo>>;
|
| + using ShelfAppIdToAppControllerMap =
|
| std::map<std::string, ArcAppWindowLauncherItemController*>;
|
|
|
| void StartObserving(Profile* profile);
|
| void StopObserving(Profile* profile);
|
|
|
| - void RegisterApp(AppWindow* app_window);
|
| - void UnregisterApp(AppWindow* app_window, bool close_controller);
|
| + void RegisterApp(AppWindowInfo* app_window_info);
|
| + void UnregisterApp(AppWindowInfo* app_window_info, bool close_controller);
|
|
|
| + AppWindowInfo* GetAppWindowInfoForTask(int task_id);
|
| AppWindow* GetAppWindowForTask(int task_id);
|
|
|
| void AttachControllerToWindowIfNeeded(aura::Window* window);
|
| @@ -114,9 +115,8 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
|
| // Not owned
|
| ash::ShelfDelegate* shelf_delegate_;
|
| int active_task_id_ = -1;
|
| - TaskIdToAppWindow task_id_to_app_window_;
|
| - TaskIdToShelfAppIdMap task_id_to_shelf_app_id_;
|
| - AppControllerMap app_controller_map_;
|
| + TaskIdToAppWindowInfo task_id_to_app_window_info_;
|
| + ShelfAppIdToAppControllerMap app_controller_map_;
|
| std::vector<aura::Window*> observed_windows_;
|
| Profile* observed_profile_ = nullptr;
|
| bool observing_shell_ = false;
|
|
|