Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2309)

Unified Diff: ash/wm/event_client_impl.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wallpaper/wallpaper_widget_controller.cc ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/event_client_impl.cc
diff --git a/ash/wm/event_client_impl.cc b/ash/wm/event_client_impl.cc
index 39ce4ac67d45b4bfb354cd3b654727f4ca25d11c..c9b3c832c6b92232c02b94cfec4158edac7e1021 100644
--- a/ash/wm/event_client_impl.cc
+++ b/ash/wm/event_client_impl.cc
@@ -29,16 +29,16 @@ bool EventClientImpl::CanProcessEventsWithinSubtree(
const aura::Window* lock_screen_containers = Shell::GetContainer(
root_window, kShellWindowId_LockScreenContainersContainer);
- const aura::Window* lock_background_containers = Shell::GetContainer(
- root_window, kShellWindowId_LockScreenBackgroundContainer);
+ const aura::Window* lock_wallpaper_containers = Shell::GetContainer(
+ root_window, kShellWindowId_LockScreenWallpaperContainer);
const aura::Window* lock_screen_related_containers = Shell::GetContainer(
root_window, kShellWindowId_LockScreenRelatedContainersContainer);
bool can_process_events =
(window->Contains(lock_screen_containers) &&
- window->Contains(lock_background_containers) &&
+ window->Contains(lock_wallpaper_containers) &&
window->Contains(lock_screen_related_containers)) ||
lock_screen_containers->Contains(window) ||
- lock_background_containers->Contains(window) ||
+ lock_wallpaper_containers->Contains(window) ||
lock_screen_related_containers->Contains(window);
if (keyboard::IsKeyboardEnabled()) {
const aura::Window* virtual_keyboard_container = Shell::GetContainer(
« no previous file with comments | « ash/wallpaper/wallpaper_widget_controller.cc ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698