Wallpaper resize extents compositor lock timeout.

ash/wallpaper/wallpaper_controller.h

Index: ash/wallpaper/wallpaper_controller.h
diff --git a/ash/wallpaper/wallpaper_controller.h b/ash/wallpaper/wallpaper_controller.h
index e72991f205552ffeb437880e421d59213a960ffa..2ca60ed58577c8a87c81339b42d9fd36ada9966a 100644
--- a/ash/wallpaper/wallpaper_controller.h
+++ b/ash/wallpaper/wallpaper_controller.h
@@ -19,6 +19,7 @@
 #include "components/wallpaper/wallpaper_layout.h"
 #include "components/wallpaper/wallpaper_resizer_observer.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "ui/compositor/compositor_lock.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -48,7 +49,8 @@ class ASH_EXPORT WallpaperController
       public ShellObserver,
       public wallpaper::WallpaperResizerObserver,
       public wallpaper::WallpaperColorCalculatorObserver,
-      public SessionObserver {
+      public SessionObserver,
+      public NON_EXPORTED_BASE(ui::CompositorLockClient) {
  public:
   enum WallpaperMode { WALLPAPER_NONE, WALLPAPER_IMAGE };
 
@@ -173,6 +175,12 @@ class ASH_EXPORT WallpaperController
   // Returns true if the wallpaper moved.
   bool MoveToUnlockedContainer();
 
+  // When wallpaper resizes, we can check which displays will be affected. For
+  // simplicity, we only lock the compositor for the internal display.
+  void GetInternalDisplayCompositorLock();
+  // CompositorLockClient:
+  void CompositorLockTimedOut() override;
+
   bool locked_;
 
   WallpaperMode wallpaper_mode_;
@@ -204,6 +212,8 @@ class ASH_EXPORT WallpaperController
 
   ScopedSessionObserver scoped_session_observer_;
 
+  std::unique_ptr<ui::CompositorLock> compositor_lock_;
+
   DISALLOW_COPY_AND_ASSIGN(WallpaperController);
 };