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

Unified Diff: ash/common/shelf/shelf_model.cc

Issue 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate. (Closed)
Patch Set: Move shelf_item_delegate to ash/public/cpp, cleanup. Created 3 years, 9 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: ash/common/shelf/shelf_model.cc
diff --git a/ash/common/shelf/shelf_model.cc b/ash/common/shelf/shelf_model.cc
index af53f33149742fabc8396579eea274e52b1d33a8..1eeb327f747217a221e2a4a1651f858423407d7d 100644
--- a/ash/common/shelf/shelf_model.cc
+++ b/ash/common/shelf/shelf_model.cc
@@ -158,7 +158,7 @@ int ShelfModel::FirstPanelIndex() const {
void ShelfModel::SetShelfItemDelegate(
ShelfID id,
- std::unique_ptr<mojom::ShelfItemDelegate> item_delegate) {
+ std::unique_ptr<ShelfItemDelegate> item_delegate) {
// If another ShelfItemDelegate is already registered for |id|, we assume
// that this request is replacing ShelfItemDelegate for |id| with
// |item_delegate|.
@@ -170,7 +170,7 @@ void ShelfModel::SetShelfItemDelegate(
id_to_item_delegate_map_[id] = std::move(item_delegate);
}
-mojom::ShelfItemDelegate* ShelfModel::GetShelfItemDelegate(ShelfID id) {
+ShelfItemDelegate* ShelfModel::GetShelfItemDelegate(ShelfID id) {
if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
return id_to_item_delegate_map_[id].get();
return nullptr;

Powered by Google App Engine
This is Rietveld 408576698