| 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 <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
| 11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" | 13 #include "base/macros.h" |
| 13 | 14 |
| 14 namespace keyboard { | 15 namespace keyboard { |
| 15 class KeyboardUI; | 16 class KeyboardUI; |
| 16 } | 17 } |
| 17 | 18 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 47 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; | 48 ash::AccessibilityDelegate* CreateAccessibilityDelegate() override; |
| 48 ash::NewWindowDelegate* CreateNewWindowDelegate() override; | 49 ash::NewWindowDelegate* CreateNewWindowDelegate() override; |
| 49 ash::MediaDelegate* CreateMediaDelegate() override; | 50 ash::MediaDelegate* CreateMediaDelegate() override; |
| 50 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, | 51 ui::MenuModel* CreateContextMenu(ash::Shelf* shelf, |
| 51 const ash::ShelfItem* item) override; | 52 const ash::ShelfItem* item) override; |
| 52 GPUSupport* CreateGPUSupport() override; | 53 GPUSupport* CreateGPUSupport() override; |
| 53 base::string16 GetProductName() const override; | 54 base::string16 GetProductName() const override; |
| 54 gfx::Image GetDeprecatedAcceleratorImage() const override; | 55 gfx::Image GetDeprecatedAcceleratorImage() const override; |
| 55 | 56 |
| 56 private: | 57 private: |
| 58 std::unique_ptr<app_list::AppListShower> app_list_shower_; |
| 59 |
| 57 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); | 60 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); |
| 58 }; | 61 }; |
| 59 | 62 |
| 60 } // namespace sysui | 63 } // namespace sysui |
| 61 } // namespace ash | 64 } // namespace ash |
| 62 | 65 |
| 63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ | 66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ |
| OLD | NEW |