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

Unified Diff: chrome/browser/extensions/bookmark_app_helper.cc

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/extensions/bookmark_app_helper.cc
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index 9b1526f8425d48d0fb7d81c6a1a2840244fd5654..3c327d281d02d3d77230072ec9cdc3277a883a23 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -76,8 +76,8 @@
#endif // defined(OS_WIN)
#if defined(USE_ASH)
-#include "ash/shelf/shelf_delegate.h" // nogncheck
-#include "ash/shell.h" // nogncheck
+#include "ash/shelf/shelf_model.h" // nogncheck
+#include "ash/shell.h" // nogncheck
#endif
namespace {
@@ -732,9 +732,7 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
web_app::CreateShortcuts(web_app::SHORTCUT_CREATION_BY_USER,
creation_locations, current_profile, extension);
#else
- ash::ShelfDelegate* shelf_delegate = ash::Shell::Get()->shelf_delegate();
- DCHECK(shelf_delegate);
- shelf_delegate->PinAppWithID(extension->id());
+ ash::Shell::Get()->shelf_model()->PinAppWithID(extension->id());
#endif // !defined(USE_ASH)
#endif // !defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698