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

Unified Diff: ash/sysui/shell_delegate_mus.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move factory ownership to WindowManagerApplication; to match AuraInit/ViewsDelegate. 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 a93abd68c4e3188453bc2f863b4feef408eef1bd..395dd6de83e6397777ec57d5bba55e93d12d7376 100644
--- a/ash/sysui/shell_delegate_mus.cc
+++ b/ash/sysui/shell_delegate_mus.cc
@@ -10,10 +10,10 @@
#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/tray/default_system_tray_delegate.h"
+#include "ash/mus/context_menu_mus.h"
#include "ash/sysui/app_list_presenter_mus.h"
-#include "ash/sysui/context_menu_mus.h"
#include "ash/sysui/shelf_delegate_mus.h"
-#include "ash/sysui/user_wallpaper_delegate_mus.h"
+#include "ash/sysui/wallpaper_delegate_mus.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "components/user_manager/user_info_impl.h"
@@ -171,8 +171,8 @@ SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
return new DefaultSystemTrayDelegate;
}
-UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() {
- return new UserWallpaperDelegateMus();
+WallpaperDelegate* ShellDelegateMus::CreateWallpaperDelegate() {
+ return new WallpaperDelegateMus();
}
SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
@@ -202,7 +202,8 @@ std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() {
ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf,
const ShelfItem* item) {
- return new ContextMenuMus(wm_shelf);
+ NOTIMPLEMENTED();
+ return nullptr;
}
GPUSupport* ShellDelegateMus::CreateGPUSupport() {

Powered by Google App Engine
This is Rietveld 408576698