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

Unified Diff: ash/test/test_shell_delegate.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/test/test_shell_delegate.h ('k') | ash/test/test_user_wallpaper_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 1de799c9711a5f6d74c798721c5367f80f8ba51a..3c6543c111554eaa5826b97580b89d7882e46cbd 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -21,7 +21,7 @@
#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shelf_delegate.h"
#include "ash/test/test_system_tray_delegate.h"
-#include "ash/test/test_user_wallpaper_delegate.h"
+#include "ash/test/test_wallpaper_delegate.h"
#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
@@ -166,8 +166,9 @@ SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
return new TestSystemTrayDelegate;
}
-UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
- return new TestUserWallpaperDelegate();
+std::unique_ptr<WallpaperDelegate>
+TestShellDelegate::CreateWallpaperDelegate() {
+ return base::MakeUnique<TestWallpaperDelegate>();
}
TestSessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() {
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/test/test_user_wallpaper_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698