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

Unified Diff: ash/sysui/sysui_application.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: Address comments 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
« no previous file with comments | « ash/sysui/shell_delegate_mus.cc ('k') | ash/sysui/user_wallpaper_delegate_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
index f71f8d334364af8f43dafbcaad777135e5b17644..f69e5063e44f2d9edf6ccb4675a416aaceab79e2 100644
--- a/ash/sysui/sysui_application.cc
+++ b/ash/sysui/sysui_application.cc
@@ -26,7 +26,7 @@
#include "ash/sysui/shelf_delegate_mus.h"
#include "ash/sysui/shell_delegate_mus.h"
#include "ash/sysui/stub_context_factory.h"
-#include "ash/sysui/user_wallpaper_delegate_mus.h"
+#include "ash/sysui/wallpaper_delegate_mus.h"
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
@@ -341,8 +341,7 @@ void SysUIApplication::Create(
void SysUIApplication::Create(const ::shell::Identity& remote_identity,
mojom::WallpaperControllerRequest request) {
mojom::WallpaperController* wallpaper_controller =
- static_cast<UserWallpaperDelegateMus*>(
- Shell::GetInstance()->user_wallpaper_delegate());
+ static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate());
wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
std::move(request));
}
« no previous file with comments | « ash/sysui/shell_delegate_mus.cc ('k') | ash/sysui/user_wallpaper_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698