ash/sysui/wallpaper_delegate_mus.cc - Issue 2290473004: Rename ash desktop_background to wallpaper.

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/wallpaper_delegate_mus.cc

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)

Patch Set: Address comments. 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:

Index: ash/sysui/wallpaper_delegate_mus.cc

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

index 02106cd79d4d4c34fbc514a5f6c996a332a0a868..db9e58a316e358ce6248194d57439e50afdd3b6e 100644

--- a/ash/sysui/wallpaper_delegate_mus.cc

+++ b/ash/sysui/wallpaper_delegate_mus.cc

@@ -4,8 +4,8 @@

#include "ash/sysui/wallpaper_delegate_mus.h"

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

#include "ash/shell.h"

+#include "ash/wallpaper/wallpaper_controller.h"

#include "components/wallpaper/wallpaper_layout.h"

#include "services/shell/public/cpp/connector.h"

#include "ui/views/mus/window_manager_connection.h"

@@ -84,7 +84,7 @@ void WallpaperDelegateMus::SetWallpaper(const SkBitmap& wallpaper,

if (wallpaper.isNull())

return;

gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(wallpaper);

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

+ Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(

image, WallpaperLayoutFromMojo(layout));

}

« no previous file with comments | « ash/sysui/sysui_application.cc ('k') | ash/test/test_session_state_animator.h » ('j') | no next file with comments »