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

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

Issue 2052013002: Adding ChromeLauncherController interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome_launcher_smaller_api
Patch Set: Rebase Created 4 years, 6 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 64889d15fd329042dfd22b2d0b589c07ee2758b5..f0b89751744ce69cc7b857ad6e20c93d2f663866 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
@@ -16,6 +16,10 @@
#include "ui/aura/env_observer.h"
#include "ui/aura/window_observer.h"
+namespace ash {
+class ShelfDelegate;
+}
+
namespace aura {
class Window;
}
@@ -34,7 +38,8 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
public aura::WindowObserver,
public ArcAppListPrefs::Observer {
public:
- explicit ArcAppWindowLauncherController(ChromeLauncherController* owner);
+ ArcAppWindowLauncherController(ChromeLauncherController* owner,
+ ash::ShelfDelegate* shelf_delegate);
~ArcAppWindowLauncherController() override;
// AppWindowLauncherControllre:
@@ -84,6 +89,8 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,
AppWindowLauncherItemController* ControllerForWindow(
aura::Window* window) override;
+ // Not owned
+ ash::ShelfDelegate* shelf_delegate_;
int active_task_id_ = -1;
TaskIdToAppWindow task_id_to_app_window_;
AppControllerMap app_controller_map_;

Powered by Google App Engine
This is Rietveld 408576698