| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MUS_SHELL_DELEGATE_MUS_H_ | 5 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_ |
| 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_ | 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 void PreInit() override; | 33 void PreInit() override; |
| 34 void PreShutdown() override; | 34 void PreShutdown() override; |
| 35 void Exit() override; | 35 void Exit() override; |
| 36 keyboard::KeyboardUI* CreateKeyboardUI() override; | 36 keyboard::KeyboardUI* CreateKeyboardUI() override; |
| 37 void VirtualKeyboardActivated(bool activated) override; | 37 void VirtualKeyboardActivated(bool activated) override; |
| 38 void AddVirtualKeyboardStateObserver( | 38 void AddVirtualKeyboardStateObserver( |
| 39 VirtualKeyboardStateObserver* observer) override; | 39 VirtualKeyboardStateObserver* observer) override; |
| 40 void RemoveVirtualKeyboardStateObserver( | 40 void RemoveVirtualKeyboardStateObserver( |
| 41 VirtualKeyboardStateObserver* observer) override; | 41 VirtualKeyboardStateObserver* observer) override; |
| 42 void OpenUrl(const GURL& url) override; | 42 void OpenUrl(const GURL& url) override; |
| 43 app_list::AppListShower* GetAppListShower() override; | 43 app_list::AppListPresenter* GetAppListPresenter() override; |
| 44 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; | 44 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
| 45 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; | 45 ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |
| 46 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; | 46 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
| 47 ash::SessionStateDelegate* CreateSessionStateDelegate() override; | 47 ash::SessionStateDelegate* CreateSessionStateDelegate() override; |
| 48 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; | 48 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; |
| 49 ash::NewWindowDelegate* CreateNewWindowDelegate() override; | 49 ash::NewWindowDelegate* CreateNewWindowDelegate() override; |
| 50 ash::MediaDelegate* CreateMediaDelegate() override; | 50 ash::MediaDelegate* CreateMediaDelegate() override; |
| 51 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 51 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
| 52 const ash::ShelfItem* item) override; | 52 const ash::ShelfItem* item) override; |
| 53 GPUSupport* CreateGPUSupport() override; | 53 GPUSupport* CreateGPUSupport() override; |
| 54 base::string16 GetProductName() const override; | 54 base::string16 GetProductName() const override; |
| 55 gfx::Image GetDeprecatedAcceleratorImage() const override; | 55 gfx::Image GetDeprecatedAcceleratorImage() const override; |
| 56 | 56 |
| 57 private: | 57 private: |
| 58 std::unique_ptr<app_list::AppListShower> app_list_shower_; | 58 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_; |
| 59 | 59 |
| 60 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); | 60 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 } // namespace sysui | 63 } // namespace sysui |
| 64 } // namespace ash | 64 } // namespace ash |
| 65 | 65 |
| 66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ | 66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ |
| OLD | NEW |