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

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

Issue 2335833002: mash: Port ash_sysui app list presenter to mojo:ash. (Closed)
Patch Set: Reorder ShellDelegateMus members. Created 4 years, 3 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/manifest.json ('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"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 13
13 namespace app_list {
14 class AppListPresenter;
15 }
16
17 namespace shell { 14 namespace shell {
18 class Connector; 15 class Connector;
19 } 16 }
20 17
21 namespace ash { 18 namespace ash {
22 19
23 class ShellDelegateMus : public ShellDelegate { 20 class ShellDelegateMus : public ShellDelegate {
24 public: 21 public:
25 ShellDelegateMus( 22 explicit ShellDelegateMus(shell::Connector* connector);
26 std::unique_ptr<app_list::AppListPresenter> app_list_presenter,
27 shell::Connector* connector);
28 ~ShellDelegateMus() override; 23 ~ShellDelegateMus() override;
29 24
30 bool IsFirstRunAfterBoot() const override; 25 bool IsFirstRunAfterBoot() const override;
31 bool IsIncognitoAllowed() const override; 26 bool IsIncognitoAllowed() const override;
32 bool IsMultiProfilesEnabled() const override; 27 bool IsMultiProfilesEnabled() const override;
33 bool IsRunningInForcedAppMode() const override; 28 bool IsRunningInForcedAppMode() const override;
34 bool CanShowWindowForUser(WmWindow* window) const override; 29 bool CanShowWindowForUser(WmWindow* window) const override;
35 bool IsForceMaximizeOnFirstRun() const override; 30 bool IsForceMaximizeOnFirstRun() const override;
36 void PreInit() override; 31 void PreInit() override;
37 void PreShutdown() override; 32 void PreShutdown() override;
38 void Exit() override; 33 void Exit() override;
39 keyboard::KeyboardUI* CreateKeyboardUI() override; 34 keyboard::KeyboardUI* CreateKeyboardUI() override;
40 void OpenUrlFromArc(const GURL& url) override; 35 void OpenUrlFromArc(const GURL& url) override;
41 app_list::AppListPresenter* GetAppListPresenter() override; 36 app_list::AppListPresenter* GetAppListPresenter() override;
42 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; 37 ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
43 SystemTrayDelegate* CreateSystemTrayDelegate() override; 38 SystemTrayDelegate* CreateSystemTrayDelegate() override;
44 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 39 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
45 SessionStateDelegate* CreateSessionStateDelegate() override; 40 SessionStateDelegate* CreateSessionStateDelegate() override;
46 AccessibilityDelegate* CreateAccessibilityDelegate() override; 41 AccessibilityDelegate* CreateAccessibilityDelegate() override;
47 NewWindowDelegate* CreateNewWindowDelegate() override; 42 NewWindowDelegate* CreateNewWindowDelegate() override;
48 MediaDelegate* CreateMediaDelegate() override; 43 MediaDelegate* CreateMediaDelegate() override;
49 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 44 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
50 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 45 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
51 const ShelfItem* item) override; 46 const ShelfItem* item) override;
52 GPUSupport* CreateGPUSupport() override; 47 GPUSupport* CreateGPUSupport() override;
53 base::string16 GetProductName() const override; 48 base::string16 GetProductName() const override;
54 gfx::Image GetDeprecatedAcceleratorImage() const override; 49 gfx::Image GetDeprecatedAcceleratorImage() const override;
55 50
56 private: 51 private:
57 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
58 shell::Connector* connector_; 52 shell::Connector* connector_;
53 AppListPresenterMus app_list_presenter_;
59 54
60 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
61 }; 56 };
62 57
63 } // namespace ash 58 } // namespace ash
64 59
65 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 60 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/manifest.json ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698