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

Unified Diff: ash/shell/shell_delegate_impl.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: Cleanup. 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/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 525856655d0aa23c7ac639e4998b240b5e47d42b..ff922c784346645c75545ccc14e05354fcf865f1 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -15,7 +15,7 @@
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/tray/default_system_tray_delegate.h"
#include "ash/common/wm/window_state.h"
-#include "ash/default_user_wallpaper_delegate.h"
+#include "ash/default_wallpaper_delegate.h"
#include "ash/shell.h"
#include "ash/shell/context_menu.h"
#include "ash/shell/example_factory.h"
@@ -236,8 +236,8 @@ ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
return new DefaultSystemTrayDelegate;
}
-ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() {
- return new DefaultUserWallpaperDelegate();
+ash::WallpaperDelegate* ShellDelegateImpl::CreateWallpaperDelegate() {
+ return new DefaultWallpaperDelegate();
}
ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() {

Powered by Google App Engine
This is Rietveld 408576698