ash/desktop_background/desktop_background_view.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/desktop_background/desktop_background_view.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

« ash/default_wallpaper_delegate.h ('K') | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/desktop_background/desktop_background_widget_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/desktop_background/desktop_background_view.cc

diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc

index be85e5e6c455a2eee9371ae8a9dff93a4aca2cc5..0884b5e551145f980eed5a58068419dd77ea979b 100644

--- a/ash/desktop_background/desktop_background_view.cc

+++ b/ash/desktop_background/desktop_background_view.cc

@@ -7,12 +7,12 @@

#include "ash/aura/wm_window_aura.h"

#include "ash/common/display/display_info.h"

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

#include "ash/common/wm/overview/window_selector_controller.h"

#include "ash/common/wm_lookup.h"

#include "ash/common/wm_shell.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/desktop_background/desktop_background_widget_controller.h"

-#include "ash/desktop_background/user_wallpaper_delegate.h"

#include "ash/root_window_controller.h"

#include "ash/shell.h"

#include "ui/display/display.h"

@@ -191,8 +191,7 @@ views::Widget* CreateDesktopBackground(WmWindow* root_window,

aura::Window* aura_root_window = WmWindowAura::GetAuraWindow(root_window);

DesktopBackgroundController* controller =

Shell::GetInstance()->desktop_background_controller();

- UserWallpaperDelegate* wallpaper_delegate =

- Shell::GetInstance()->user_wallpaper_delegate();

+ WallpaperDelegate* wallpaper_delegate = WmShell::Get()->wallpaper_delegate();

views::Widget* desktop_widget = new views::Widget;

views::Widget::InitParams params(