OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_ | 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_ |
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ | 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 VirtualKeyboardStateObserver* observer) override; | 54 VirtualKeyboardStateObserver* observer) override; |
55 void OpenUrl(const GURL& url) override; | 55 void OpenUrl(const GURL& url) override; |
56 app_list::AppListPresenter* GetAppListPresenter() override; | 56 app_list::AppListPresenter* GetAppListPresenter() override; |
57 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; | 57 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
58 SystemTrayDelegate* CreateSystemTrayDelegate() override; | 58 SystemTrayDelegate* CreateSystemTrayDelegate() override; |
59 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 59 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
60 TestSessionStateDelegate* CreateSessionStateDelegate() override; | 60 TestSessionStateDelegate* CreateSessionStateDelegate() override; |
61 AccessibilityDelegate* CreateAccessibilityDelegate() override; | 61 AccessibilityDelegate* CreateAccessibilityDelegate() override; |
62 NewWindowDelegate* CreateNewWindowDelegate() override; | 62 NewWindowDelegate* CreateNewWindowDelegate() override; |
63 MediaDelegate* CreateMediaDelegate() override; | 63 MediaDelegate* CreateMediaDelegate() override; |
| 64 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() |
| 65 override; |
64 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 66 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
65 const ash::ShelfItem* item) override; | 67 const ash::ShelfItem* item) override; |
66 GPUSupport* CreateGPUSupport() override; | 68 GPUSupport* CreateGPUSupport() override; |
67 base::string16 GetProductName() const override; | 69 base::string16 GetProductName() const override; |
68 gfx::Image GetDeprecatedAcceleratorImage() const override; | 70 gfx::Image GetDeprecatedAcceleratorImage() const override; |
69 | 71 |
70 int num_exit_requests() const { return num_exit_requests_; } | 72 int num_exit_requests() const { return num_exit_requests_; } |
71 | 73 |
72 app_list::AppListPresenterImpl* app_list_presenter() { | 74 app_list::AppListPresenterImpl* app_list_presenter() { |
73 return app_list_presenter_.get(); | 75 return app_list_presenter_.get(); |
(...skipping 16 matching lines...) Expand all Loading... |
90 base::ObserverList<ash::VirtualKeyboardStateObserver> | 92 base::ObserverList<ash::VirtualKeyboardStateObserver> |
91 keyboard_state_observer_list_; | 93 keyboard_state_observer_list_; |
92 | 94 |
93 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 95 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
94 }; | 96 }; |
95 | 97 |
96 } // namespace test | 98 } // namespace test |
97 } // namespace ash | 99 } // namespace ash |
98 | 100 |
99 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 101 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
OLD | NEW |