Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1153)

Unified Diff: ash/wm/workspace/workspace_manager2.h

Issue 11054005: ash: Display system background while loading wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win_aura compile, hopefully Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace/system_background_controller.cc ('k') | ash/wm/workspace/workspace_manager2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_manager2.h
diff --git a/ash/wm/workspace/workspace_manager2.h b/ash/wm/workspace/workspace_manager2.h
index 8a9b9db7fe853eea5db0d407a1cb0579843b8b2d..1cd1b0c13070b5a75b2a75906ef251421c1686b0 100644
--- a/ash/wm/workspace/workspace_manager2.h
+++ b/ash/wm/workspace/workspace_manager2.h
@@ -36,7 +36,6 @@ namespace ash {
namespace internal {
class ShelfLayoutManager;
-class SystemBackgroundController;
class WorkspaceLayoutManager2;
class WorkspaceManagerTest2;
class Workspace2;
@@ -139,9 +138,6 @@ class ASH_EXPORT WorkspaceManager2
// any layers.
void ProcessDeletion();
- // Deletes |background_controller_|. Called from |destroy_background_timer_|.
- void DestroySystemBackground();
-
// Sets |unminimizing_workspace_| to |workspace|.
void SetUnminimizingWorkspace(Workspace2* workspace);
@@ -198,14 +194,6 @@ class ASH_EXPORT WorkspaceManager2
// 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_;
« no previous file with comments | « ash/wm/workspace/system_background_controller.cc ('k') | ash/wm/workspace/workspace_manager2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698