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

Unified Diff: ash/sysui/shell_delegate_mus.cc

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Alternative display info workaround. Created 4 years, 3 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 214a627c98608a59dfa75ff14adb2312a28e5090..694f48cbd830c5a48788600d69e8423b756ad0e6 100644
--- a/ash/sysui/shell_delegate_mus.cc
+++ b/ash/sysui/shell_delegate_mus.cc
@@ -10,8 +10,8 @@
#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/common/wallpaper/wallpaper_delegate.h"
#include "ash/sysui/app_list_presenter_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"
@@ -170,7 +170,8 @@ SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
}
std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
- return base::MakeUnique<WallpaperDelegateMus>();
+ NOTIMPLEMENTED();
+ return nullptr;
}
SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {

Powered by Google App Engine
This is Rietveld 408576698