ash/desktop_background/desktop_background_controller.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_controller.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/desktop_background/desktop_background_controller.cc

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

index 510e9e789c01540d2aa9cd4764aa9d6151d08f6a..44a65db72b4d53e688ae2fa1d374614fb519d23c 100644

--- a/ash/desktop_background/desktop_background_controller.cc

+++ b/ash/desktop_background/desktop_background_controller.cc

@@ -7,11 +7,11 @@

#include "ash/aura/wm_window_aura.h"

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

#include "ash/common/shell_window_ids.h"

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

#include "ash/common/wm_shell.h"

#include "ash/desktop_background/desktop_background_controller_observer.h"

#include "ash/desktop_background/desktop_background_view.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 "base/bind.h"

@@ -252,7 +252,7 @@ int DesktopBackgroundController::GetBackgroundContainerId(bool locked) {

void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) {

current_wallpaper_.reset();

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

+ WmShell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);

}

} // namespace ash

« ash/default_wallpaper_delegate.h ('K') | « ash/default_wallpaper_delegate.cc ('k') | ash/desktop_background/desktop_background_controller_unittest.cc » ('j') | no next file with comments »