Add screen rotation animator lock.

ash/wallpaper/wallpaper_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wallpaper/wallpaper_controller.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
+#include "ash/rotator/screen_rotation_animator_lock.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wallpaper/wallpaper_controller_observer.h"
 #include "ash/wallpaper/wallpaper_delegate.h"
 #include "ash/wallpaper/wallpaper_view.h"
 #include "ash/wallpaper/wallpaper_widget_controller.h"
 #include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 123 matching lines @@
           << " layout=" << layout;
 
   if (WallpaperIsAlreadyLoaded(image, true /* compare_layouts */, layout)) {
     VLOG(1) << "Wallpaper is already loaded";
     return;
   }
 
   current_wallpaper_.reset(new wallpaper::WallpaperResizer(
       image, GetMaxDisplaySizeInNative(), layout, task_runner_));
   current_wallpaper_->AddObserver(this);
+  if (screen_rotation_animator_lock_)
+    screen_rotation_animator_lock_->lock();
   current_wallpaper_->StartResize();
 
   for (auto& observer : observers_)
     observer.OnWallpaperDataChanged();
   wallpaper_mode_ = WALLPAPER_IMAGE;
   InstallDesktopControllerForAllWindows();
 }
 
 void WallpaperController::CreateEmptyWallpaper() {
   SetProminentColor(kInvalidColor);
@@ skipping 110 matching lines @@
 }
 
 void WallpaperController::OnWallpaperResized() {
   CalculateWallpaperColors();
 }
 
 void WallpaperController::OnColorCalculationComplete() {
   const SkColor color = color_calculator_->prominent_color();
   color_calculator_.reset();
   SetProminentColor(color);
+  if (screen_rotation_animator_lock_)
+    screen_rotation_animator_lock_->unlock();
 }
 
 void WallpaperController::InstallDesktopController(WmWindow* root_window) {
   WallpaperWidgetController* component = nullptr;
   int container_id = GetWallpaperContainerId(locked_);
 
   switch (wallpaper_mode_) {
     case WALLPAPER_IMAGE: {
       component = new WallpaperWidgetController(
           CreateWallpaper(root_window, container_id));
@@ skipping 106 matching lines @@
 
 bool WallpaperController::MoveToUnlockedContainer() {
   if (!locked_)
     return false;
 
   locked_ = false;
   return ReparentWallpaper(GetWallpaperContainerId(false));
 }
 
 }  // namespace ash