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_SHELL_SHELL_DELEGATE_IMPL_H_ | 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_ |
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ | 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_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 VirtualKeyboardStateObserver* observer) override; | 48 VirtualKeyboardStateObserver* observer) override; |
49 void OpenUrl(const GURL& url) override; | 49 void OpenUrl(const GURL& url) override; |
50 app_list::AppListPresenter* GetAppListPresenter() override; | 50 app_list::AppListPresenter* GetAppListPresenter() override; |
51 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; | 51 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
52 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; | 52 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |
53 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 53 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
54 ash::SessionStateDelegate* CreateSessionStateDelegate() override; | 54 ash::SessionStateDelegate* CreateSessionStateDelegate() override; |
55 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; | 55 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; |
56 ash::NewWindowDelegate* CreateNewWindowDelegate() override; | 56 ash::NewWindowDelegate* CreateNewWindowDelegate() override; |
57 ash::MediaDelegate* CreateMediaDelegate() override; | 57 ash::MediaDelegate* CreateMediaDelegate() override; |
| 58 std::unique_ptr<ContainerDelegate> CreateContainerDelegate() override; |
58 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() | 59 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() |
59 override; | 60 override; |
60 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 61 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
61 const ash::ShelfItem* item) override; | 62 const ash::ShelfItem* item) override; |
62 GPUSupport* CreateGPUSupport() override; | 63 GPUSupport* CreateGPUSupport() override; |
63 base::string16 GetProductName() const override; | 64 base::string16 GetProductName() const override; |
64 gfx::Image GetDeprecatedAcceleratorImage() const override; | 65 gfx::Image GetDeprecatedAcceleratorImage() const override; |
65 | 66 |
66 private: | 67 private: |
67 ShelfDelegateImpl* shelf_delegate_; | 68 ShelfDelegateImpl* shelf_delegate_; |
68 std::unique_ptr<app_list::AppListPresenterDelegateFactory> | 69 std::unique_ptr<app_list::AppListPresenterDelegateFactory> |
69 app_list_presenter_delegate_factory_; | 70 app_list_presenter_delegate_factory_; |
70 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; | 71 std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_; |
71 | 72 |
72 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); | 73 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); |
73 }; | 74 }; |
74 | 75 |
75 } // namespace shell | 76 } // namespace shell |
76 } // namespace ash | 77 } // namespace ash |
77 | 78 |
78 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ | 79 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ |
OLD | NEW |