ash/mus/shell_delegate_mus.cc - Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash.

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/mus/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:

Index: ash/mus/shell_delegate_mus.cc

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

index 5e1d6d4c0d1c9bcd1ae909af68e1cd6a324cb910..f4efbad70a49d2ef12fa98aae9968618214d5398 100644

--- a/ash/mus/shell_delegate_mus.cc

+++ b/ash/mus/shell_delegate_mus.cc

@@ -11,12 +11,12 @@

#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/common/wm_shell.h"

#include "ash/mus/accessibility_delegate_mus.h"

#include "ash/mus/context_menu_mus.h"

#include "ash/mus/new_window_delegate_mus.h"

#include "ash/mus/shelf_delegate_mus.h"

+#include "ash/mus/wallpaper_delegate_mus.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

#include "base/strings/string_util.h"

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

}

std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {

- NOTIMPLEMENTED();

- return nullptr;

+ return base::MakeUnique<WallpaperDelegateMus>(connector_);

}

SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {