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/shelf/shelf_bezel_event_handler.h" | 5 #include "ash/shelf/shelf_bezel_event_handler.h" |
6 | 6 |
7 #include "ash/shelf/wm_shelf.h" | 7 #include "ash/shelf/shelf.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 #include "ui/display/display.h" | 10 #include "ui/display/display.h" |
11 #include "ui/display/screen.h" | 11 #include "ui/display/screen.h" |
12 #include "ui/events/event.h" | 12 #include "ui/events/event.h" |
13 #include "ui/gfx/geometry/point.h" | 13 #include "ui/gfx/geometry/point.h" |
14 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
15 #include "ui/wm/core/coordinate_conversion.h" | 15 #include "ui/wm/core/coordinate_conversion.h" |
16 | 16 |
17 namespace ash { | 17 namespace ash { |
18 | 18 |
19 ShelfBezelEventHandler::ShelfBezelEventHandler(WmShelf* shelf) | 19 ShelfBezelEventHandler::ShelfBezelEventHandler(Shelf* shelf) |
20 : shelf_(shelf), in_touch_drag_(false) { | 20 : shelf_(shelf), in_touch_drag_(false) { |
21 Shell::Get()->AddPreTargetHandler(this); | 21 Shell::Get()->AddPreTargetHandler(this); |
22 } | 22 } |
23 | 23 |
24 ShelfBezelEventHandler::~ShelfBezelEventHandler() { | 24 ShelfBezelEventHandler::~ShelfBezelEventHandler() { |
25 Shell::Get()->RemovePreTargetHandler(this); | 25 Shell::Get()->RemovePreTargetHandler(this); |
26 } | 26 } |
27 | 27 |
28 void ShelfBezelEventHandler::OnGestureEvent(ui::GestureEvent* event) { | 28 void ShelfBezelEventHandler::OnGestureEvent(ui::GestureEvent* event) { |
29 gfx::Point point_in_screen(event->location()); | 29 gfx::Point point_in_screen(event->location()); |
(...skipping 17 matching lines...) Expand all Loading... |
47 default: | 47 default: |
48 break; | 48 break; |
49 } | 49 } |
50 event->StopPropagation(); | 50 event->StopPropagation(); |
51 } | 51 } |
52 } | 52 } |
53 } | 53 } |
54 | 54 |
55 bool ShelfBezelEventHandler::IsShelfOnBezel(const gfx::Rect& screen, | 55 bool ShelfBezelEventHandler::IsShelfOnBezel(const gfx::Rect& screen, |
56 const gfx::Point& point) const { | 56 const gfx::Point& point) const { |
57 switch (shelf_->GetAlignment()) { | 57 switch (shelf_->alignment()) { |
58 case SHELF_ALIGNMENT_BOTTOM: | 58 case SHELF_ALIGNMENT_BOTTOM: |
59 case SHELF_ALIGNMENT_BOTTOM_LOCKED: | 59 case SHELF_ALIGNMENT_BOTTOM_LOCKED: |
60 return point.y() >= screen.bottom(); | 60 return point.y() >= screen.bottom(); |
61 case SHELF_ALIGNMENT_LEFT: | 61 case SHELF_ALIGNMENT_LEFT: |
62 return point.x() <= screen.x(); | 62 return point.x() <= screen.x(); |
63 case SHELF_ALIGNMENT_RIGHT: | 63 case SHELF_ALIGNMENT_RIGHT: |
64 return point.x() >= screen.right(); | 64 return point.x() >= screen.right(); |
65 } | 65 } |
66 NOTREACHED(); | 66 NOTREACHED(); |
67 return false; | 67 return false; |
68 } | 68 } |
69 | 69 |
70 } // namespace ash | 70 } // namespace ash |
OLD | NEW |