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

ash/wm/workspace/workspace_manager2.h

 // 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.
 
 #ifndef ASH_WM_WORKSPACE_WORKSPACE_MANAGER2_H_
 #define ASH_WM_WORKSPACE_WORKSPACE_MANAGER2_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
 }
 
 namespace ui {
 class Layer;
 }
 
 namespace ash {
 namespace internal {
 
 class ShelfLayoutManager;
-class SystemBackgroundController;
 class WorkspaceLayoutManager2;
 class WorkspaceManagerTest2;
 class Workspace2;
 
 // WorkspaceManager manages multiple workspaces in the desktop. Workspaces are
 // implicitly created as windows are maximized (or made fullscreen), and
 // destroyed when maximized windows are closed or restored. There is always one
 // workspace for the desktop.
 // Internally WorkspaceManager2 creates a Window for each Workspace. As windows
 // are maximized and restored they are reparented to the right Window.
@@ skipping 78 matching lines @@
   void SelectNextWorkspace(AnimateType animate_type);
 
   // Schedules |workspace| for deletion when it no longer contains any layers.
   // See comments above |to_delete_| as to why we do this.
   void ScheduleDelete(Workspace2* workspace);
 
   // Deletes any workspaces scheduled via ScheduleDelete() that don't contain
   // any layers.
   void ProcessDeletion();
 
-  // Deletes |background_controller_|. Called from |destroy_background_timer_|.
-  void DestroySystemBackground();
-
   // Sets |unminimizing_workspace_| to |workspace|.
   void SetUnminimizingWorkspace(Workspace2* workspace);
 
   // These methods are forwarded from the LayoutManager installed on the
   // Workspace's window.
   void OnWindowAddedToWorkspace(Workspace2* workspace, aura::Window* child);
   void OnWillRemoveWindowFromWorkspace(Workspace2* workspace,
                                        aura::Window* child);
   void OnWindowRemovedFromWorkspace(Workspace2* workspace, aura::Window* child);
   void OnWorkspaceChildWindowVisibilityChanged(Workspace2* workspace,
@@ skipping 36 matching lines @@
   // Ideally we would delete workspaces when not needed. Unfortunately doing so
   // would effectively cancel animations. Instead when a workspace is no longer
   // needed we add it here and start a timer. When the timer fires any windows
   // no longer contain layers are deleted.
   std::set<Workspace2*> to_delete_;
   base::OneShotTimer<WorkspaceManager2> delete_timer_;
 
   // See comments in SetUnminimizingWorkspace() for details.
   base::WeakPtrFactory<WorkspaceManager2> clear_unminimizing_workspace_factory_;
 
-  // Used to show the system level background. Non-null when the background is
-  // visible.
-  scoped_ptr<SystemBackgroundController> background_controller_;
-
-  // Timer used to destroy the background. We wait to destroy until animations
-  // complete.
-  base::OneShotTimer<WorkspaceManager2> destroy_background_timer_;
-
   // See comments in SetUnminimizingWorkspace() for details.
   Workspace2* unminimizing_workspace_;
 
   // Set to true if the app is terminating. If true we don't animate the
   // background, otherwise it can get stuck in the fading position when chrome
   // exits (as the last frame we draw before exiting is a frame from the
   // animation).
   bool app_terminating_;
 
   // If non-empty this is the amount of time animating the desktop in/out.
   base::TimeDelta switch_duration_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManager2);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WORKSPACE_MANAGER2_H_