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

Unified Diff: ash/wm/workspace_controller_test_helper.cc

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_test_helper.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller_test_helper.cc
diff --git a/ash/wm/workspace_controller_test_helper.cc b/ash/wm/workspace_controller_test_helper.cc
index 4e0d2037225f304ed20772cba26eb58791896755..929b53a55ce9dc442a1cc63ff3e6a3b68a15792d 100644
--- a/ash/wm/workspace_controller_test_helper.cc
+++ b/ash/wm/workspace_controller_test_helper.cc
@@ -20,12 +20,9 @@ WorkspaceControllerTestHelper::~WorkspaceControllerTestHelper() {
}
WorkspaceEventHandler* WorkspaceControllerTestHelper::GetEventHandler() {
- if (WorkspaceController::IsWorkspace2Enabled()) {
- ui::EventTarget::TestApi test_api(controller_->viewport_->children()[0]);
- return static_cast<WorkspaceEventHandler*>(
- test_api.pre_target_handlers().front());
- }
- return controller_->event_handler_;
+ ui::EventTarget::TestApi test_api(controller_->viewport_->children()[0]);
+ return static_cast<WorkspaceEventHandler*>(
+ test_api.pre_target_handlers().front());
}
MultiWindowResizeController*
« no previous file with comments | « ash/wm/workspace_controller_test_helper.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698