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

Unified Diff: ash/wm/workspace_controller_test_helper.h

Issue 10857021: Prepare a bunch of ash tests for workspace2. With Workspace2 you can't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 04b19436bc2766b309adccf69f4413713e6716c5..c48f0964c2b77ea3352c53d2a2db719c68be8178 100644
--- a/ash/wm/workspace_controller_test_helper.h
+++ b/ash/wm/workspace_controller_test_helper.h
@@ -6,6 +6,7 @@
#define ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_
#include "ash/wm/workspace_controller.h"
+#include "ash/wm/workspace/workspace_manager.h"
namespace ash {
namespace internal {
@@ -18,10 +19,11 @@ class WorkspaceControllerTestHelper {
explicit WorkspaceControllerTestHelper(WorkspaceController* controller);
~WorkspaceControllerTestHelper();
- WorkspaceEventFilter* filter() { return controller_->event_filter_; }
+ WorkspaceEventFilter* GetFilter();
MultiWindowResizeController* GetMultiWindowResizeController();
WorkspaceManager* workspace_manager() {
- return controller_->workspace_manager_.get();
+ return static_cast<WorkspaceManager*>(
+ 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