| 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*
|
|
|