| Index: ash/wm/panels/panel_window_event_handler.cc
|
| diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc
|
| index 6dfab047cd23db72e0df8de9e3156621da4fb142..784533e535acd5d8c2e8b9a2c294a36b44995b3a 100644
|
| --- a/ash/wm/panels/panel_window_event_handler.cc
|
| +++ b/ash/wm/panels/panel_window_event_handler.cc
|
| @@ -5,8 +5,7 @@
|
| #include "ash/wm/panels/panel_window_event_handler.h"
|
|
|
| #include "ash/common/wm/window_state.h"
|
| -#include "ash/metrics/user_metrics_recorder.h"
|
| -#include "ash/shell.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_delegate.h"
|
| @@ -15,11 +14,9 @@
|
|
|
| namespace ash {
|
|
|
| -PanelWindowEventHandler::PanelWindowEventHandler() {
|
| -}
|
| +PanelWindowEventHandler::PanelWindowEventHandler() {}
|
|
|
| -PanelWindowEventHandler::~PanelWindowEventHandler() {
|
| -}
|
| +PanelWindowEventHandler::~PanelWindowEventHandler() {}
|
|
|
| void PanelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| @@ -29,8 +26,7 @@ void PanelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) {
|
| event->IsOnlyLeftMouseButton() &&
|
| target->delegate()->GetNonClientComponent(event->location()) ==
|
| HTCAPTION) {
|
| - ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
|
| - ash::UMA_PANEL_MINIMIZE_CAPTION_CLICK);
|
| + WmShell::Get()->RecordUserMetricsAction(UMA_PANEL_MINIMIZE_CAPTION_CLICK);
|
| wm::GetWindowState(target)->Minimize();
|
| event->StopPropagation();
|
| return;
|
| @@ -44,8 +40,7 @@ void PanelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
| event->details().tap_count() == 2 &&
|
| target->delegate()->GetNonClientComponent(event->location()) ==
|
| HTCAPTION) {
|
| - ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
|
| - ash::UMA_PANEL_MINIMIZE_CAPTION_GESTURE);
|
| + WmShell::Get()->RecordUserMetricsAction(UMA_PANEL_MINIMIZE_CAPTION_GESTURE);
|
| wm::GetWindowState(target)->Minimize();
|
| event->StopPropagation();
|
| return;
|
|
|