Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Address comment. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b37fd95225b1014af7bba5bab604b6f7c63312be..77101b855890737e0933791f700ecc41bd2a7ff6 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
@@ -18,10 +18,6 @@
#include "ui/aura/env_observer.h"
#include "ui/aura/window_observer.h"
-namespace ash {
-class ShelfDelegate;
-}
-
namespace aura {
class Window;
}
@@ -37,8 +33,7 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
public ash::ShellObserver,
public ArcAppListPrefs::Observer {
public:
- ArcAppWindowLauncherController(ChromeLauncherController* owner,
- ash::ShelfDelegate* shelf_delegate);
+ explicit ArcAppWindowLauncherController(ChromeLauncherController* owner);
~ArcAppWindowLauncherController() override;
// Returns shelf app id. Play Store app is mapped to ARC platform host app.
@@ -118,8 +113,6 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
AppWindowLauncherItemController* ControllerForWindow(
aura::Window* window) override;
- // Not owned
- ash::ShelfDelegate* shelf_delegate_;
int active_task_id_ = -1;
TaskIdToAppWindowInfo task_id_to_app_window_info_;
ShelfGroupToAppControllerMap app_shelf_group_to_controller_map_;

Powered by Google App Engine
This is Rietveld 408576698