Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/panels/panel_window_event_handler.h" | 5 #include "ash/wm/panels/panel_window_event_handler.h" |
| 6 | 6 |
| 7 #include "ash/metrics/user_metrics_recorder.h" | 7 #include "ash/metrics/user_metrics_recorder.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| 11 #include "ui/aura/window_delegate.h" | 11 #include "ui/aura/window_delegate.h" |
| 12 #include "ui/base/hit_test.h" | 12 #include "ui/base/hit_test.h" |
| 13 #include "ui/events/event.h" | 13 #include "ui/events/event.h" |
| 14 | 14 |
| 15 namespace ash { | 15 namespace ash { |
| 16 | 16 |
| 17 PanelWindowEventHandler::PanelWindowEventHandler() { | 17 PanelWindowEventHandler::PanelWindowEventHandler() { |
| 18 } | 18 } |
| 19 | 19 |
| 20 PanelWindowEventHandler::~PanelWindowEventHandler() { | 20 PanelWindowEventHandler::~PanelWindowEventHandler() { |
| 21 } | 21 } |
| 22 | 22 |
| 23 void PanelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) { | 23 void PanelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) { |
| 24 aura::Window* target = static_cast<aura::Window*>(event->target()); | 24 aura::Window* target = static_cast<aura::Window*>(event->target()); |
| 25 if (!event->handled() && | 25 if (!event->handled() && |
| 26 event->type() == ui::ET_MOUSE_PRESSED && | 26 event->type() == ui::ET_MOUSE_PRESSED && |
| 27 event->flags() & ui::EF_IS_DOUBLE_CLICK && | 27 event->flags() & ui::EF_IS_DOUBLE_CLICK && |
| 28 event->IsOnlyLeftMouseButton() && | 28 event->IsOnlyLeftMouseButton() && |
| 29 target->delegate() && | |
|
Nina
2015/01/09 15:43:49
Without this change, this code crashed when handli
| |
| 29 target->delegate()->GetNonClientComponent(event->location()) == | 30 target->delegate()->GetNonClientComponent(event->location()) == |
| 30 HTCAPTION) { | 31 HTCAPTION) { |
| 31 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( | 32 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( |
| 32 ash::UMA_PANEL_MINIMIZE_CAPTION_CLICK); | 33 ash::UMA_PANEL_MINIMIZE_CAPTION_CLICK); |
| 33 wm::GetWindowState(target)->Minimize(); | 34 wm::GetWindowState(target)->Minimize(); |
| 34 event->StopPropagation(); | 35 event->StopPropagation(); |
| 35 return; | 36 return; |
| 36 } | 37 } |
| 37 } | 38 } |
| 38 | 39 |
| 39 void PanelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) { | 40 void PanelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) { |
| 40 aura::Window* target = static_cast<aura::Window*>(event->target()); | 41 aura::Window* target = static_cast<aura::Window*>(event->target()); |
| 41 if (!event->handled() && | 42 if (!event->handled() && |
| 42 event->type() == ui::ET_GESTURE_TAP && | 43 event->type() == ui::ET_GESTURE_TAP && |
| 43 event->details().tap_count() == 2 && | 44 event->details().tap_count() == 2 && |
| 45 target->delegate() && | |
|
Nina
2015/01/09 15:43:49
Same as L29
| |
| 44 target->delegate()->GetNonClientComponent(event->location()) == | 46 target->delegate()->GetNonClientComponent(event->location()) == |
| 45 HTCAPTION) { | 47 HTCAPTION) { |
| 46 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( | 48 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction( |
| 47 ash::UMA_PANEL_MINIMIZE_CAPTION_GESTURE); | 49 ash::UMA_PANEL_MINIMIZE_CAPTION_GESTURE); |
| 48 wm::GetWindowState(target)->Minimize(); | 50 wm::GetWindowState(target)->Minimize(); |
| 49 event->StopPropagation(); | 51 event->StopPropagation(); |
| 50 return; | 52 return; |
| 51 } | 53 } |
| 52 } | 54 } |
| 53 | 55 |
| 54 } // namespace ash | 56 } // namespace ash |
| OLD | NEW |