ash/utility/screenshot_controller.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/utility/screenshot_controller.cc

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

Patch Set: Cleanup 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/utility/screenshot_controller.cc

diff --git a/ash/utility/screenshot_controller.cc b/ash/utility/screenshot_controller.cc

index 683fd6d83bdc13910b27262388a60f574fbad966..1a912248812441001d980b71752a9aab4ba9ea29 100644

--- a/ash/utility/screenshot_controller.cc

+++ b/ash/utility/screenshot_controller.cc

@@ -387,8 +387,8 @@ void ScreenshotController::UpdateSelectedWindow(ui::LocatedEvent* event) {

selected = selected->parent();

}

- if (selected->parent()->id() == kShellWindowId_DesktopBackgroundContainer ||

- selected->parent()->id() == kShellWindowId_LockScreenBackgroundContainer)

+ if (selected->parent()->id() == kShellWindowId_WallpaperContainer ||

+ selected->parent()->id() == kShellWindowId_LockScreenWallpaperContainer)

selected = nullptr;

SetSelectedWindow(selected);