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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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/root_window_controller.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" 11 #include "ash/mus/app_list_presenter_mus.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace shell { 14 namespace service_manager {
15 class Connector; 15 class Connector;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 19
20 class ShellDelegateMus : public ShellDelegate { 20 class ShellDelegateMus : public ShellDelegate {
21 public: 21 public:
22 explicit ShellDelegateMus(shell::Connector* connector); 22 explicit ShellDelegateMus(service_manager::Connector* connector);
23 ~ShellDelegateMus() override; 23 ~ShellDelegateMus() override;
24 24
25 // ShellDelegate: 25 // ShellDelegate:
26 ::shell::Connector* GetShellConnector() const override; 26 service_manager::Connector* GetShellConnector() const override;
27 bool IsFirstRunAfterBoot() const override; 27 bool IsFirstRunAfterBoot() const override;
28 bool IsIncognitoAllowed() const override; 28 bool IsIncognitoAllowed() const override;
29 bool IsMultiProfilesEnabled() const override; 29 bool IsMultiProfilesEnabled() const override;
30 bool IsRunningInForcedAppMode() const override; 30 bool IsRunningInForcedAppMode() const override;
31 bool CanShowWindowForUser(WmWindow* window) const override; 31 bool CanShowWindowForUser(WmWindow* window) const override;
32 bool IsForceMaximizeOnFirstRun() const override; 32 bool IsForceMaximizeOnFirstRun() const override;
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 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; 44 NewWindowDelegate* CreateNewWindowDelegate() override;
45 MediaDelegate* CreateMediaDelegate() override; 45 MediaDelegate* CreateMediaDelegate() override;
46 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 46 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
47 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 47 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
48 const ShelfItem* item) override; 48 const ShelfItem* item) override;
49 GPUSupport* CreateGPUSupport() override; 49 GPUSupport* CreateGPUSupport() override;
50 base::string16 GetProductName() const override; 50 base::string16 GetProductName() const override;
51 gfx::Image GetDeprecatedAcceleratorImage() const override; 51 gfx::Image GetDeprecatedAcceleratorImage() const override;
52 52
53 private: 53 private:
54 shell::Connector* connector_; 54 service_manager::Connector* connector_;
55 AppListPresenterMus app_list_presenter_; 55 AppListPresenterMus app_list_presenter_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 57 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
58 }; 58 };
59 59
60 } // namespace ash 60 } // namespace ash
61 61
62 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 62 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/root_window_controller.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698