| OLD | NEW |
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/system/tray/actionable_view.h" | 5 #include "ash/common/system/tray/actionable_view.h" |
| 6 | 6 |
| 7 #include "ash/common/ash_constants.h" | 7 #include "ash/common/ash_constants.h" |
| 8 #include "ui/accessibility/ax_view_state.h" | 8 #include "ui/accessibility/ax_view_state.h" |
| 9 #include "ui/gfx/canvas.h" | 9 #include "ui/gfx/canvas.h" |
| 10 | 10 |
| 11 namespace ash { | 11 namespace ash { |
| 12 | 12 |
| 13 // static | 13 // static |
| 14 const char ActionableView::kViewClassName[] = "tray/ActionableView"; | 14 const char ActionableView::kViewClassName[] = "tray/ActionableView"; |
| 15 | 15 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // We render differently when focused. | 84 // We render differently when focused. |
| 85 SchedulePaint(); | 85 SchedulePaint(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void ActionableView::OnGestureEvent(ui::GestureEvent* event) { | 88 void ActionableView::OnGestureEvent(ui::GestureEvent* event) { |
| 89 if (event->type() == ui::ET_GESTURE_TAP && PerformAction(*event)) | 89 if (event->type() == ui::ET_GESTURE_TAP && PerformAction(*event)) |
| 90 event->SetHandled(); | 90 event->SetHandled(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace ash | 93 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2066583004:
mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove