| 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  |   9  | 
|  10 #include "ash/common/shell_delegate.h" |  10 #include "ash/common/shell_delegate.h" | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
|  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 OpenUrlFromArc(const GURL& url) override; |  37   void OpenUrlFromArc(const GURL& url) override; | 
|  38   app_list::AppListPresenter* GetAppListPresenter() override; |  38   app_list::AppListPresenter* GetAppListPresenter() override; | 
|  39   ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |  39   ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; | 
|  40   SystemTrayDelegate* CreateSystemTrayDelegate() override; |  40   SystemTrayDelegate* CreateSystemTrayDelegate() override; | 
|  41   std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; |  41   std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; | 
|  42   SessionStateDelegate* CreateSessionStateDelegate() override; |  42   SessionStateDelegate* CreateSessionStateDelegate() override; | 
|  43   AccessibilityDelegate* CreateAccessibilityDelegate() override; |  43   AccessibilityDelegate* CreateAccessibilityDelegate() override; | 
|  44   NewWindowDelegate* CreateNewWindowDelegate() override; |  | 
|  45   MediaDelegate* CreateMediaDelegate() override; |  44   MediaDelegate* CreateMediaDelegate() override; | 
|  46   std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; |  45   std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; | 
|  47   ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, |  46   ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, | 
|  48                                    const ShelfItem* item) override; |  47                                    const ShelfItem* item) override; | 
|  49   GPUSupport* CreateGPUSupport() override; |  48   GPUSupport* CreateGPUSupport() override; | 
|  50   base::string16 GetProductName() const override; |  49   base::string16 GetProductName() const override; | 
|  51   gfx::Image GetDeprecatedAcceleratorImage() const override; |  50   gfx::Image GetDeprecatedAcceleratorImage() const override; | 
|  52  |  51  | 
|  53  private: |  52  private: | 
|  54   service_manager::Connector* connector_; |  53   service_manager::Connector* connector_; | 
|  55   AppListPresenterMus app_list_presenter_; |  54   AppListPresenterMus app_list_presenter_; | 
|  56  |  55  | 
|  57   DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); |  56   DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); | 
|  58 }; |  57 }; | 
|  59  |  58  | 
|  60 }  // namespace ash |  59 }  // namespace ash | 
|  61  |  60  | 
|  62 #endif  // ASH_MUS_SHELL_DELEGATE_MUS_H_ |  61 #endif  // ASH_MUS_SHELL_DELEGATE_MUS_H_ | 
| OLD | NEW |