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 |
11 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 | 14 |
| 15 namespace app_list { |
| 16 class AppListShowerDelegateFactory; |
| 17 class AppListShowerImpl; |
| 18 } |
| 19 |
15 namespace keyboard { | 20 namespace keyboard { |
16 class KeyboardUI; | 21 class KeyboardUI; |
17 } | 22 } |
18 | 23 |
19 namespace ash { | 24 namespace ash { |
20 namespace shell { | 25 namespace shell { |
21 | 26 |
22 class ShelfDelegateImpl; | 27 class ShelfDelegateImpl; |
23 | 28 |
24 class ShellDelegateImpl : public ash::ShellDelegate { | 29 class ShellDelegateImpl : public ash::ShellDelegate { |
(...skipping 10 matching lines...) Expand all Loading... |
35 void PreInit() override; | 40 void PreInit() override; |
36 void PreShutdown() override; | 41 void PreShutdown() override; |
37 void Exit() override; | 42 void Exit() override; |
38 keyboard::KeyboardUI* CreateKeyboardUI() override; | 43 keyboard::KeyboardUI* CreateKeyboardUI() override; |
39 void VirtualKeyboardActivated(bool activated) override; | 44 void VirtualKeyboardActivated(bool activated) override; |
40 void AddVirtualKeyboardStateObserver( | 45 void AddVirtualKeyboardStateObserver( |
41 VirtualKeyboardStateObserver* observer) override; | 46 VirtualKeyboardStateObserver* observer) override; |
42 void RemoveVirtualKeyboardStateObserver( | 47 void RemoveVirtualKeyboardStateObserver( |
43 VirtualKeyboardStateObserver* observer) override; | 48 VirtualKeyboardStateObserver* observer) override; |
44 void OpenUrl(const GURL& url) override; | 49 void OpenUrl(const GURL& url) override; |
45 app_list::AppListViewDelegate* GetAppListViewDelegate() override; | 50 app_list::AppListShower* GetAppListShower() override; |
46 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; | 51 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
47 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; | 52 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |
48 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 53 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
49 ash::SessionStateDelegate* CreateSessionStateDelegate() override; | 54 ash::SessionStateDelegate* CreateSessionStateDelegate() override; |
50 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; | 55 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; |
51 ash::NewWindowDelegate* CreateNewWindowDelegate() override; | 56 ash::NewWindowDelegate* CreateNewWindowDelegate() override; |
52 ash::MediaDelegate* CreateMediaDelegate() override; | 57 ash::MediaDelegate* CreateMediaDelegate() override; |
53 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 58 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
54 const ash::ShelfItem* item) override; | 59 const ash::ShelfItem* item) override; |
55 GPUSupport* CreateGPUSupport() override; | 60 GPUSupport* CreateGPUSupport() override; |
56 base::string16 GetProductName() const override; | 61 base::string16 GetProductName() const override; |
57 gfx::Image GetDeprecatedAcceleratorImage() const override; | 62 gfx::Image GetDeprecatedAcceleratorImage() const override; |
58 | 63 |
59 private: | 64 private: |
60 ShelfDelegateImpl* shelf_delegate_; | 65 ShelfDelegateImpl* shelf_delegate_; |
61 std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; | 66 std::unique_ptr<app_list::AppListShowerDelegateFactory> |
| 67 app_list_shower_delegate_factory_; |
| 68 std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_; |
62 | 69 |
63 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); | 70 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); |
64 }; | 71 }; |
65 | 72 |
66 } // namespace shell | 73 } // namespace shell |
67 } // namespace ash | 74 } // namespace ash |
68 | 75 |
69 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ | 76 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ |
OLD | NEW |