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

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

Issue 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate. (Closed)
Patch Set: Sync and rebase. 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_deferred_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h
index e9ea416f50f069ce5f8b36c2837cf2c2b7ce2cf4..71ffff4e21b4442c68183f54dd252aa2ec69ac04 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h
@@ -7,22 +7,20 @@
#include <string>
+#include "ash/public/cpp/shelf_item_delegate.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
class ArcAppDeferredLauncherController;
-class ChromeLauncherController;
// ArcAppDeferredLauncherItemController displays the icon of the ARC app that
// cannot be launched immediately (due to ARC not being ready) on Chrome OS'
// shelf, with an overlaid spinner to provide visual feedback.
-class ArcAppDeferredLauncherItemController : public LauncherItemController {
+class ArcAppDeferredLauncherItemController : public ash::ShelfItemDelegate {
public:
ArcAppDeferredLauncherItemController(
const std::string& arc_app_id,
- ChromeLauncherController* controller,
int event_flags,
const base::WeakPtr<ArcAppDeferredLauncherController>& host);
@@ -32,7 +30,7 @@ class ArcAppDeferredLauncherItemController : public LauncherItemController {
int event_flags() const { return event_flags_; }
- // LauncherItemController:
+ // ash::ShelfItemDelegate:
void ItemSelected(std::unique_ptr<ui::Event> event,
int64_t display_id,
ash::ShelfLaunchSource source,

Powered by Google App Engine
This is Rietveld 408576698