Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(555)

Side by Side Diff: ash/mus/shell_delegate_mus.h

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Sync and rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/app_list_presenter_mus.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/mus/app_list_presenter_mus.h"
12 #include "base/macros.h" 11 #include "base/macros.h"
13 12
14 namespace service_manager { 13 namespace service_manager {
15 class Connector; 14 class Connector;
16 } 15 }
17 16
18 namespace ash { 17 namespace ash {
19 18
20 class ShellDelegateMus : public ShellDelegate { 19 class ShellDelegateMus : public ShellDelegate {
21 public: 20 public:
22 explicit ShellDelegateMus(service_manager::Connector* connector); 21 explicit ShellDelegateMus(service_manager::Connector* connector);
23 ~ShellDelegateMus() override; 22 ~ShellDelegateMus() override;
24 23
25 // ShellDelegate: 24 // ShellDelegate:
26 service_manager::Connector* GetShellConnector() const override; 25 service_manager::Connector* GetShellConnector() const override;
27 bool IsIncognitoAllowed() const override; 26 bool IsIncognitoAllowed() const override;
28 bool IsMultiProfilesEnabled() const override; 27 bool IsMultiProfilesEnabled() const override;
29 bool IsRunningInForcedAppMode() const override; 28 bool IsRunningInForcedAppMode() const override;
30 bool CanShowWindowForUser(WmWindow* window) const override; 29 bool CanShowWindowForUser(WmWindow* window) const override;
31 bool IsForceMaximizeOnFirstRun() const override; 30 bool IsForceMaximizeOnFirstRun() const override;
32 void PreInit() override; 31 void PreInit() override;
33 void PreShutdown() override; 32 void PreShutdown() override;
34 void Exit() override; 33 void Exit() override;
35 keyboard::KeyboardUI* CreateKeyboardUI() override; 34 keyboard::KeyboardUI* CreateKeyboardUI() override;
36 void OpenUrlFromArc(const GURL& url) override; 35 void OpenUrlFromArc(const GURL& url) override;
37 app_list::AppListPresenter* GetAppListPresenter() override;
38 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 36 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
39 SystemTrayDelegate* CreateSystemTrayDelegate() override; 37 SystemTrayDelegate* CreateSystemTrayDelegate() override;
40 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 38 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
41 SessionStateDelegate* CreateSessionStateDelegate() override; 39 SessionStateDelegate* CreateSessionStateDelegate() override;
42 AccessibilityDelegate* CreateAccessibilityDelegate() override; 40 AccessibilityDelegate* CreateAccessibilityDelegate() override;
43 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 41 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
44 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 42 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
45 const ShelfItem* item) override; 43 const ShelfItem* item) override;
46 GPUSupport* CreateGPUSupport() override; 44 GPUSupport* CreateGPUSupport() override;
47 base::string16 GetProductName() const override; 45 base::string16 GetProductName() const override;
48 gfx::Image GetDeprecatedAcceleratorImage() const override; 46 gfx::Image GetDeprecatedAcceleratorImage() const override;
49 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 47 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
50 void SetTouchscreenEnabledInPrefs(bool enabled, 48 void SetTouchscreenEnabledInPrefs(bool enabled,
51 bool use_local_state) override; 49 bool use_local_state) override;
52 void UpdateTouchscreenStatusFromPrefs() override; 50 void UpdateTouchscreenStatusFromPrefs() override;
53 51
54 private: 52 private:
55 service_manager::Connector* connector_; 53 service_manager::Connector* connector_;
56 AppListPresenterMus app_list_presenter_;
57 54
58 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
59 }; 56 };
60 57
61 } // namespace ash 58 } // namespace ash
62 59
63 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 60 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/app_list_presenter_mus.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698