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::PointerWatcherDelegate> CreatePointerWatcherDelegate() |
| 64 override; |
63 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 65 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
64 const ash::ShelfItem* item) override; | 66 const ash::ShelfItem* item) override; |
65 ash::GPUSupport* CreateGPUSupport() override; | 67 ash::GPUSupport* CreateGPUSupport() override; |
66 base::string16 GetProductName() const override; | 68 base::string16 GetProductName() const override; |
67 void OpenKeyboardShortcutHelpPage() const override; | 69 void OpenKeyboardShortcutHelpPage() const override; |
68 gfx::Image GetDeprecatedAcceleratorImage() const override; | 70 gfx::Image GetDeprecatedAcceleratorImage() const override; |
69 void ToggleTouchpad() override; | 71 void ToggleTouchpad() override; |
70 void ToggleTouchscreen() override; | 72 void ToggleTouchscreen() override; |
71 | 73 |
72 // content::NotificationObserver override: | 74 // content::NotificationObserver override: |
(...skipping 16 matching lines...) Expand all Loading... |
89 | 91 |
90 #if defined(OS_CHROMEOS) | 92 #if defined(OS_CHROMEOS) |
91 std::unique_ptr<chromeos::DisplayConfigurationObserver> | 93 std::unique_ptr<chromeos::DisplayConfigurationObserver> |
92 display_configuration_observer_; | 94 display_configuration_observer_; |
93 #endif | 95 #endif |
94 | 96 |
95 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 97 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |
96 }; | 98 }; |
97 | 99 |
98 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 100 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
OLD | NEW |