| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 void OpenUrlFromArc(const GURL& url) override; | 48 void OpenUrlFromArc(const GURL& url) override; |
| 49 app_list::AppListPresenter* GetAppListPresenter() override; | 49 app_list::AppListPresenter* GetAppListPresenter() override; |
| 50 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; | 50 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
| 51 SystemTrayDelegate* CreateSystemTrayDelegate() override; | 51 SystemTrayDelegate* CreateSystemTrayDelegate() override; |
| 52 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 52 UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
| 53 TestSessionStateDelegate* CreateSessionStateDelegate() override; | 53 TestSessionStateDelegate* CreateSessionStateDelegate() override; |
| 54 AccessibilityDelegate* CreateAccessibilityDelegate() override; | 54 AccessibilityDelegate* CreateAccessibilityDelegate() override; |
| 55 NewWindowDelegate* CreateNewWindowDelegate() override; | 55 NewWindowDelegate* CreateNewWindowDelegate() override; |
| 56 MediaDelegate* CreateMediaDelegate() override; | 56 MediaDelegate* CreateMediaDelegate() override; |
| 57 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; | 57 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; |
| 58 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() | |
| 59 override; | |
| 60 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, | 58 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, |
| 61 const ShelfItem* item) override; | 59 const ShelfItem* item) override; |
| 62 GPUSupport* CreateGPUSupport() override; | 60 GPUSupport* CreateGPUSupport() override; |
| 63 base::string16 GetProductName() const override; | 61 base::string16 GetProductName() const override; |
| 64 gfx::Image GetDeprecatedAcceleratorImage() const override; | 62 gfx::Image GetDeprecatedAcceleratorImage() const override; |
| 65 | 63 |
| 66 int num_exit_requests() const { return num_exit_requests_; } | 64 int num_exit_requests() const { return num_exit_requests_; } |
| 67 | 65 |
| 68 app_list::AppListPresenterImpl* app_list_presenter() { | 66 app_list::AppListPresenterImpl* app_list_presenter() { |
| 69 return app_list_presenter_.get(); | 67 return app_list_presenter_.get(); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 83 app_list_presenter_delegate_factory_; | 81 app_list_presenter_delegate_factory_; |
| 84 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; | 82 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; |
| 85 | 83 |
| 86 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); | 84 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); |
| 87 }; | 85 }; |
| 88 | 86 |
| 89 } // namespace test | 87 } // namespace test |
| 90 } // namespace ash | 88 } // namespace ash |
| 91 | 89 |
| 92 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ | 90 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ |
| OLD | NEW |