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

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

Issue 2800263002: Revert of mash: Remove ChromeLauncherController's |id_to_item_controller_map_|. (Closed)
Patch Set: 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/chrome_launcher_controller_mus.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
index 51babed985fa122db4e726397bc56f79c3edaeb8..e5066041800b9d050ba1476e5c2d49d0357cc320 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
@@ -22,6 +22,9 @@
const ash::ShelfItem* GetItem(ash::ShelfID id) const override;
void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override;
void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override;
+ void SetShelfItemDelegate(
+ ash::ShelfID id,
+ std::unique_ptr<ash::ShelfItemDelegate> item_delegate) override;
void CloseLauncherItem(ash::ShelfID id) override;
bool IsPinned(ash::ShelfID id) override;
void SetV1AppStatus(const std::string& app_id,
@@ -59,6 +62,7 @@
content::WebContents* web_contents) const override;
BrowserShortcutLauncherItemController*
GetBrowserShortcutLauncherItemController() override;
+ ash::ShelfItemDelegate* GetShelfItemDelegate(const ash::ShelfID id) override;
bool ShelfBoundsChangesProbablyWithUser(
ash::WmShelf* shelf,
const AccountId& account_id) const override;

Powered by Google App Engine
This is Rietveld 408576698