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

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

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix wallpaper tests again Created 4 years, 5 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 2e70bdabbb140f148ac605d63bca8e4cd5bb9bf8..c70be4913c2ab8a94311736e25bb44e3a2d0dcd4 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -72,8 +72,8 @@
#endif // defined(OS_WIN)
#if defined(USE_ASH)
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/wm_shell.h"
#endif
namespace {
@@ -718,7 +718,9 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
web_app::CreateShortcuts(web_app::SHORTCUT_CREATION_BY_USER,
creation_locations, current_profile, extension);
#else
- ash::Shell::GetInstance()->GetShelfDelegate()->PinAppWithID(extension->id());
+ ash::ShelfDelegate* shelf_delegate = ash::WmShell::Get()->shelf_delegate();
+ DCHECK(shelf_delegate);
+ shelf_delegate->PinAppWithID(extension->id());
#endif // !defined(USE_ASH)
#endif // !defined(OS_MACOSX)

Powered by Google App Engine
This is Rietveld 408576698