Merge 159822 - ash: Display system background while loading wallpaper.

ash/wm/workspace/workspace_manager2.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/wm/workspace/workspace_manager2.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm/workspace/system_background_controller.h"
 #include "ash/wm/workspace/workspace_layout_manager2.h"
 #include "ash/wm/workspace/workspace2.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ skipping 288 matching lines @@
     // won't see the animation.
     contents_view_->StackChildAtTop(active_workspace_->window());
   } else if (active_workspace_->is_maximized() && last_active->is_maximized()) {
     // When switching between maximized windows we need the last active
     // workspace on top of the new, otherwise the animations won't look
     // right. Since only one workspace is visible at a time stacking order of
     // the workspace windows ultimately doesn't matter.
     contents_view_->StackChildAtTop(last_active->window());
   }
 
-  destroy_background_timer_.Stop();
-  if (active_workspace_ == desktop_workspace()) {
-    base::TimeDelta delay(GetSystemBackgroundDestroyDuration());
-    if (ui::LayerAnimator::slow_animation_mode())
-      delay *= ui::LayerAnimator::slow_animation_scale_factor();
-    // Delay an extra 100ms to make sure everything settles down before
-    // destroying the background.
-    delay += base::TimeDelta::FromMilliseconds(100);
-    destroy_background_timer_.Start(
-        FROM_HERE, delay, this, &WorkspaceManager2::DestroySystemBackground);
-  } else if (!background_controller_.get()) {
-    background_controller_.reset(new SystemBackgroundController(
-                                     contents_view_->GetRootWindow()));
-  }
-
   UpdateShelfVisibility();
 
   if (animate_type != ANIMATE_NONE) {
     AnimateBetweenWorkspaces(
         last_active->window(),
         WorkspaceType(last_active),
         (animate_type == ANIMATE_OLD_AND_NEW),
         workspace->window(),
         WorkspaceType(workspace),
         is_unminimizing_maximized_window);
@@ skipping 89 matching lines @@
     SetActiveWorkspace(*(workspace_i - 1), animate_type);
 }
 
 void WorkspaceManager2::ScheduleDelete(Workspace2* workspace) {
   to_delete_.insert(workspace);
   delete_timer_.Stop();
   delete_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
                       &WorkspaceManager2::ProcessDeletion);
 }
 
-void WorkspaceManager2::DestroySystemBackground() {
-  background_controller_.reset();
-}
-
 void WorkspaceManager2::SetUnminimizingWorkspace(Workspace2* workspace) {
   // The normal sequence of unminimizing a window is: Show() the window, which
   // triggers changing the kShowStateKey to NORMAL and lastly the window is made
   // active. This means at the time the window is unminimized we don't know if
   // the workspace it is in is going to become active. To track this
   // |unminimizing_workspace_| is set at the time we unminimize and a task is
   // schedule to reset it. This way when we get the activate we know we're in
   // the process unminimizing and can do the right animation.
   unminimizing_workspace_ = workspace;
   if (unminimizing_workspace_) {
@@ skipping 142 matching lines @@
   const bool is_active = wm::IsActiveWindow(window);
   if (is_active)
     new_workspace->window()->Show();
   ReparentWindow(window, new_workspace->window(), NULL);
   if (is_active)
     SetActiveWorkspace(new_workspace, ANIMATE_OLD_AND_NEW);
 }
 
 }  // namespace internal
 }  // namespace ash