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 #ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ | 5 #ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ |
6 #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ | 6 #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ |
7 | 7 |
8 #include "ash/common/shelf/shelf_item_delegate.h" | |
9 #include "ash/common/shelf/shelf_item_types.h" | 8 #include "ash/common/shelf/shelf_item_types.h" |
| 9 #include "ash/public/interfaces/shelf.mojom.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 namespace shell { | 14 namespace shell { |
15 | 15 |
16 class WindowWatcher; | 16 class WindowWatcher; |
17 | 17 |
18 // ShelfItemDelegate implementation used by WindowWatcher. | 18 // ShelfItemDelegate implementation used by WindowWatcher. |
19 class WindowWatcherShelfItemDelegate : public ShelfItemDelegate { | 19 class WindowWatcherShelfItemDelegate : public mojom::ShelfItemDelegate { |
20 public: | 20 public: |
21 WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher); | 21 WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher); |
22 ~WindowWatcherShelfItemDelegate() override; | 22 ~WindowWatcherShelfItemDelegate() override; |
23 | 23 |
24 // ShelfItemDelegate: | 24 // mojom::ShelfItemDelegate: |
25 ShelfAction ItemSelected(ui::EventType event_type, | 25 void ItemSelected(std::unique_ptr<ui::Event> event, |
26 int event_flags, | 26 int64_t display_id, |
27 int64_t display_id, | 27 ShelfLaunchSource source, |
28 ShelfLaunchSource source) override; | 28 const ItemSelectedCallback& callback) override; |
29 ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; | 29 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override; |
30 void ExecuteCommand(uint32_t command_id, int event_flags) override; | |
31 void Close() override; | 30 void Close() override; |
32 | 31 |
33 private: | 32 private: |
34 ShelfID id_; | 33 ShelfID id_; |
35 WindowWatcher* watcher_; | 34 WindowWatcher* watcher_; |
36 | 35 |
37 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate); | 36 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate); |
38 }; | 37 }; |
39 | 38 |
40 } // namespace shell | 39 } // namespace shell |
41 } // namespace ash | 40 } // namespace ash |
42 | 41 |
43 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ | 42 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ |
OLD | NEW |