ash/shell/shell_delegate_impl.cc - Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus 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/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: Move factory ownership to WindowManagerApplication; to match AuraInit/ViewsDelegate. 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 3f63ee14d190394cf032038578258e7787810218..fd4a645f1074a13a2441737d7318cb5ea504d721 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"

@@ -239,8 +239,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() {

« ash/default_wallpaper_delegate.h ('K') | « ash/shell/shell_delegate_impl.h ('k') | ash/sysui/BUILD.gn » ('j') | no next file with comments »