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 CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 ash::VirtualKeyboardStateObserver* observer) override; | 53 ash::VirtualKeyboardStateObserver* observer) override; |
54 void OpenUrl(const GURL& url) override; | 54 void OpenUrl(const GURL& url) override; |
55 app_list::AppListPresenter* GetAppListPresenter() override; | 55 app_list::AppListPresenter* GetAppListPresenter() override; |
56 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; | 56 ash::ShelfDelegate* CreateShelfDelegate(ash::ShelfModel* model) override; |
57 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; | 57 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |
58 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 58 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
59 ash::SessionStateDelegate* CreateSessionStateDelegate() override; | 59 ash::SessionStateDelegate* CreateSessionStateDelegate() override; |
60 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; | 60 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; |
61 ash::NewWindowDelegate* CreateNewWindowDelegate() override; | 61 ash::NewWindowDelegate* CreateNewWindowDelegate() override; |
62 ash::MediaDelegate* CreateMediaDelegate() override; | 62 ash::MediaDelegate* CreateMediaDelegate() override; |
| 63 std::unique_ptr<ash::ContainerDelegate> CreateContainerDelegate() override; |
63 std::unique_ptr<ash::PointerWatcherDelegate> CreatePointerWatcherDelegate() | 64 std::unique_ptr<ash::PointerWatcherDelegate> CreatePointerWatcherDelegate() |
64 override; | 65 override; |
65 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 66 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
66 const ash::ShelfItem* item) override; | 67 const ash::ShelfItem* item) override; |
67 ash::GPUSupport* CreateGPUSupport() override; | 68 ash::GPUSupport* CreateGPUSupport() override; |
68 base::string16 GetProductName() const override; | 69 base::string16 GetProductName() const override; |
69 void OpenKeyboardShortcutHelpPage() const override; | 70 void OpenKeyboardShortcutHelpPage() const override; |
70 gfx::Image GetDeprecatedAcceleratorImage() const override; | 71 gfx::Image GetDeprecatedAcceleratorImage() const override; |
71 void ToggleTouchpad() override; | 72 void ToggleTouchpad() override; |
72 void ToggleTouchscreen() override; | 73 void ToggleTouchscreen() override; |
(...skipping 18 matching lines...) Expand all Loading... |
91 | 92 |
92 #if defined(OS_CHROMEOS) | 93 #if defined(OS_CHROMEOS) |
93 std::unique_ptr<chromeos::DisplayConfigurationObserver> | 94 std::unique_ptr<chromeos::DisplayConfigurationObserver> |
94 display_configuration_observer_; | 95 display_configuration_observer_; |
95 #endif | 96 #endif |
96 | 97 |
97 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 98 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |
98 }; | 99 }; |
99 | 100 |
100 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 101 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
OLD | NEW |