OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_COMMON_SHELF_WM_SHELF_H_ | 5 #ifndef ASH_SHELF_WM_SHELF_H_ |
6 #define ASH_COMMON_SHELF_WM_SHELF_H_ | 6 #define ASH_SHELF_WM_SHELF_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
11 #include "ash/common/shelf/shelf_layout_manager_observer.h" | |
12 #include "ash/public/cpp/shelf_types.h" | 11 #include "ash/public/cpp/shelf_types.h" |
| 12 #include "ash/shelf/shelf_layout_manager_observer.h" |
13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
14 | 14 |
15 namespace gfx { | 15 namespace gfx { |
16 class Rect; | 16 class Rect; |
17 } | 17 } |
18 | 18 |
19 namespace ui { | 19 namespace ui { |
20 class GestureEvent; | 20 class GestureEvent; |
21 } | 21 } |
22 | 22 |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 | 178 |
179 // Forwards touch gestures on a bezel sensor to the shelf. | 179 // Forwards touch gestures on a bezel sensor to the shelf. |
180 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 | 180 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 |
181 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; | 181 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; |
182 | 182 |
183 DISALLOW_COPY_AND_ASSIGN(WmShelf); | 183 DISALLOW_COPY_AND_ASSIGN(WmShelf); |
184 }; | 184 }; |
185 | 185 |
186 } // namespace ash | 186 } // namespace ash |
187 | 187 |
188 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ | 188 #endif // ASH_SHELF_WM_SHELF_H_ |
OLD | NEW |