| Index: ash/wm/workspace/workspace_event_handler.cc
|
| diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc
|
| index e01c65073e5c07eb2a661cc1b4ffd6b7f35d93b5..39d8ec0da75ac04cbde578905af0ea645b8bd2b6 100644
|
| --- a/ash/wm/workspace/workspace_event_handler.cc
|
| +++ b/ash/wm/workspace/workspace_event_handler.cc
|
| @@ -4,9 +4,9 @@
|
|
|
| #include "ash/wm/workspace/workspace_event_handler.h"
|
|
|
| +#include "ash/shell_port.h"
|
| #include "ash/wm/window_state.h"
|
| #include "ash/wm/wm_event.h"
|
| -#include "ash/wm_shell.h"
|
| #include "ash/wm_window.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/events/event.h"
|
| @@ -47,7 +47,7 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event,
|
| if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
|
| int component = target->GetNonClientComponent(event->location());
|
| if (component == HTCAPTION && component == click_component_) {
|
| - WmShell::Get()->RecordUserMetricsAction(
|
| + ShellPort::Get()->RecordUserMetricsAction(
|
| UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK);
|
| const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION);
|
| target_state->OnWMEvent(&wm_event);
|
| @@ -79,14 +79,14 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event,
|
| return;
|
|
|
| if (event->details().tap_count() != 2) {
|
| - WmShell::Get()->RecordGestureAction(GESTURE_FRAMEVIEW_TAP);
|
| + ShellPort::Get()->RecordGestureAction(GESTURE_FRAMEVIEW_TAP);
|
| return;
|
| }
|
|
|
| if (click_component_ == previous_target_component) {
|
| - WmShell::Get()->RecordUserMetricsAction(
|
| + ShellPort::Get()->RecordUserMetricsAction(
|
| UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE);
|
| - WmShell::Get()->RecordGestureAction(GESTURE_MAXIMIZE_DOUBLETAP);
|
| + ShellPort::Get()->RecordGestureAction(GESTURE_MAXIMIZE_DOUBLETAP);
|
| const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION);
|
| target->GetWindowState()->OnWMEvent(&wm_event);
|
| event->StopPropagation();
|
| @@ -101,13 +101,13 @@ void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
|
| if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
|
| int component = target->GetNonClientComponent(event->location());
|
| if (component == HTBOTTOM || component == HTTOP) {
|
| - WmShell::Get()->RecordUserMetricsAction(
|
| + ShellPort::Get()->RecordUserMetricsAction(
|
| UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);
|
| const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE);
|
| target_state->OnWMEvent(&wm_event);
|
| event->StopPropagation();
|
| } else if (component == HTLEFT || component == HTRIGHT) {
|
| - WmShell::Get()->RecordUserMetricsAction(
|
| + ShellPort::Get()->RecordUserMetricsAction(
|
| UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);
|
| const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE);
|
| target_state->OnWMEvent(&wm_event);
|
|
|