Index: ash/wallpaper/wallpaper_controller.cc |
diff --git a/ash/wallpaper/wallpaper_controller.cc b/ash/wallpaper/wallpaper_controller.cc |
index 2991f51db0545ad44fd7796927d02d8112a4ec9a..8ebe54a50af035d8f0498f9cb2f0365d70695a1b 100644 |
--- a/ash/wallpaper/wallpaper_controller.cc |
+++ b/ash/wallpaper/wallpaper_controller.cc |
@@ -416,14 +416,15 @@ bool WallpaperController::MoveToUnlockedContainer() { |
void WallpaperController::GetInternalDisplayCompositorLock() { |
if (display::Display::HasInternalDisplay()) { |
- compositor_lock_ = |
- Shell::Get() |
- ->window_tree_host_manager() |
- ->GetRootWindowForDisplayId(display::Display::InternalDisplayId()) |
- ->layer() |
- ->GetCompositor() |
- ->GetCompositorLock(this, base::TimeDelta::FromMilliseconds( |
- kCompositorLockTimeoutMs)); |
+ aura::Window* root_window = |
+ Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId( |
+ display::Display::InternalDisplayId()); |
+ if (root_window) { |
+ compositor_lock_ = |
+ root_window->layer()->GetCompositor()->GetCompositorLock( |
+ this, |
+ base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs)); |
+ } |
} |
} |