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

Unified Diff: ash/wm/workspace_controller_test_helper.h

Issue 11201002: Removes worskpace 1 code. Will rename next. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove constants and add back kDisableLoginAnimations 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_controller.cc ('k') | ash/wm/workspace_controller_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller_test_helper.h
diff --git a/ash/wm/workspace_controller_test_helper.h b/ash/wm/workspace_controller_test_helper.h
index ea5be9b53231e0bdf17ad5c6d35645de61571b06..3a0ebe12196811b1fa4070ba4c251d9aebf7edac 100644
--- a/ash/wm/workspace_controller_test_helper.h
+++ b/ash/wm/workspace_controller_test_helper.h
@@ -6,7 +6,6 @@
#define ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_
#include "ash/wm/workspace_controller.h"
-#include "ash/wm/workspace/workspace_manager.h"
#include "ash/wm/workspace/workspace_manager2.h"
namespace ash {
@@ -22,13 +21,8 @@ class WorkspaceControllerTestHelper {
WorkspaceEventHandler* GetEventHandler();
MultiWindowResizeController* GetMultiWindowResizeController();
- WorkspaceManager* workspace_manager() {
- return static_cast<WorkspaceManager*>(
- controller_->workspace_manager_.get());
- }
WorkspaceManager2* workspace_manager2() {
- return static_cast<WorkspaceManager2*>(
- controller_->workspace_manager_.get());
+ return controller_->workspace_manager_.get();
}
private:
« no previous file with comments | « ash/wm/workspace_controller.cc ('k') | ash/wm/workspace_controller_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698