diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-11-27 08:37:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-27 16:37:25 +0000 |
| commit | ce0f53bd19b7832edca32ad50861cd122766fb4e (patch) | |
| tree | 2028e15d50fcfb15740f8e29f7bf4c629264aba1 /ash/wm | |
| parent | 7cc596ea65cc1f60b01bcafe0baea501192b386f (diff) | |
| download | chromium_src-ce0f53bd19b7832edca32ad50861cd122766fb4e.zip chromium_src-ce0f53bd19b7832edca32ad50861cd122766fb4e.tar.gz chromium_src-ce0f53bd19b7832edca32ad50861cd122766fb4e.tar.bz2 | |
Make WorkspaceEventHandler no longer a post target event handler
BUG=None
TEST=None
Review URL: https://codereview.chromium.org/759323003
Cr-Commit-Position: refs/heads/master@{#305997}
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/workspace/workspace_event_handler.cc | 11 | ||||
| -rw-r--r-- | ash/wm/workspace_controller.cc | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index bba3f76..4de23da 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc @@ -63,17 +63,17 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) { target_state->OnWMEvent(&wm_event); event->StopPropagation(); } - // WindowEventHandler can receive each event up to two times. Once a - // double-click has been received clear the target. Otherwise a - // duplicate of the event will be checking target history against - // itself. click_component_ = HTNOWHERE; } } else { click_component_ = HTNOWHERE; } + // The multi window resizer does not hide as a result of a single click + // because this code is never reached as a result of a single click. + // TODO(pkotwicz): Fix this. http://crbug.com/437125 multi_window_resize_controller_.Hide(); + HandleVerticalResizeDoubleClick(target_state, event); break; } @@ -95,7 +95,6 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) { return; if (event->details().tap_count() != 2) { - // Note: TouchUMA::GESTURE_FRAMEVIEW_TAP is counted twice for each tap. TouchUMA::GetInstance()-> RecordGestureAction(TouchUMA::GESTURE_FRAMEVIEW_TAP); return; @@ -104,8 +103,6 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) { if (click_component_ == previous_target_component) { ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( ash::UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE); - // Note: TouchUMA::GESTURE_FRAMEVIEW_TAP is counted twice each time - // TouchUMA::GESTURE_MAXIMIZE_DOUBLETAP is counted once. TouchUMA::GetInstance()->RecordGestureAction( TouchUMA::GESTURE_MAXIMIZE_DOUBLETAP); const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION); diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index 5d3ae6e..d186b0d 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -48,13 +48,11 @@ WorkspaceController::WorkspaceController(aura::Window* viewport) viewport_->SetLayoutManager(layout_manager_); viewport_->AddPreTargetHandler(event_handler_.get()); - viewport_->AddPostTargetHandler(event_handler_.get()); } WorkspaceController::~WorkspaceController() { viewport_->SetLayoutManager(NULL); viewport_->RemovePreTargetHandler(event_handler_.get()); - viewport_->RemovePostTargetHandler(event_handler_.get()); } WorkspaceWindowState WorkspaceController::GetWindowState() const { |