ash/sysui/shell_delegate_mus.cc - Issue 1984433002: Hook up Chrome's wallpaper picker for mash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/sysui/shell_delegate_mus.cc

Issue 1984433002: Hook up Chrome's wallpaper picker for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add ash::mojom qualifiers; given new ash::sysui::mojom namespace. Created 4 years, 7 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:

Index: ash/sysui/shell_delegate_mus.cc

diff --git a/ash/sysui/shell_delegate_mus.cc b/ash/sysui/shell_delegate_mus.cc

index 8681dee161882d0c9701fed1a52b264baf5de448..26397a6456d24ed39ffb91518e4d093a27f5f90b 100644

--- a/ash/sysui/shell_delegate_mus.cc

+++ b/ash/sysui/shell_delegate_mus.cc

@@ -5,7 +5,6 @@

#include "ash/sysui/shell_delegate_mus.h"

#include "ash/default_accessibility_delegate.h"

-#include "ash/default_user_wallpaper_delegate.h"

#include "ash/gpu_support_stub.h"

#include "ash/media_delegate.h"

#include "ash/session/session_state_delegate.h"

@@ -15,6 +14,7 @@

#include "ash/sysui/context_menu_mus.h"

#include "ash/sysui/pointer_watcher_delegate_mus.h"

#include "ash/sysui/shelf_delegate_mus.h"

+#include "ash/sysui/user_wallpaper_delegate_mus.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

#include "components/user_manager/user_info_impl.h"

@@ -185,8 +185,7 @@ SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {

}

UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() {

- NOTIMPLEMENTED() << " Using the default UserWallpaperDelegate implementation";

- return new DefaultUserWallpaperDelegate();

+ return new UserWallpaperDelegateMus();

}

SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {