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

ash/wm/workspace/workspace_manager2.h

Index: ash/wm/workspace/workspace_manager2.h
===================================================================
--- ash/wm/workspace/workspace_manager2.h	(revision 160653)
+++ ash/wm/workspace/workspace_manager2.h	(working copy)
@@ -36,7 +36,6 @@
 namespace internal {
 
 class ShelfLayoutManager;
-class SystemBackgroundController;
 class WorkspaceLayoutManager2;
 class WorkspaceManagerTest2;
 class Workspace2;
@@ -135,9 +134,6 @@
   // any layers.
   void ProcessDeletion();
 
-  // Deletes |background_controller_|. Called from |destroy_background_timer_|.
-  void DestroySystemBackground();
-
   // Sets |unminimizing_workspace_| to |workspace|.
   void SetUnminimizingWorkspace(Workspace2* workspace);
 
@@ -194,14 +190,6 @@
   // 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_;