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

Unified Diff: ash/sysui/shell_delegate_mus.cc

Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Destroy the window manager app before tearing down MD controllers. Created 4 years, 4 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/sysui/shell_delegate_mus.cc
diff --git a/ash/sysui/shell_delegate_mus.cc b/ash/sysui/shell_delegate_mus.cc
index 68a99c77f41cee27af5fb65aa96b39e3c5df8dcb..1e3779a916b456e855f49ad1006e9bec6fb5c232 100644
--- a/ash/sysui/shell_delegate_mus.cc
+++ b/ash/sysui/shell_delegate_mus.cc
@@ -13,7 +13,6 @@
#include "ash/sysui/app_list_presenter_mus.h"
#include "ash/sysui/context_menu_mus.h"
#include "ash/sysui/pointer_watcher_delegate_mus.h"
-#include "ash/sysui/shelf_delegate_mus.h"
#include "ash/sysui/user_wallpaper_delegate_mus.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
@@ -164,7 +163,7 @@ app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
}
ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
- return new ShelfDelegateMus(model);
+ return nullptr;
}
SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {

Powered by Google App Engine
This is Rietveld 408576698