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

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

Issue 2154523002: Move AccessibilityDelegate ownership to ash::WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setmediadelegate
Patch Set: fix mash_unittests Created 4 years, 5 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/bridge/wm_shell_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 "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace app_list { 13 namespace app_list {
14 class AppListPresenter; 14 class AppListPresenter;
15 } 15 }
16 16
17 namespace shell {
18 class Connector;
19 }
20
17 namespace ash { 21 namespace ash {
18 22
19 class ShellDelegateMus : public ShellDelegate { 23 class ShellDelegateMus : public ShellDelegate {
20 public: 24 public:
21 explicit ShellDelegateMus( 25 ShellDelegateMus(
22 std::unique_ptr<app_list::AppListPresenter> app_list_presenter); 26 std::unique_ptr<app_list::AppListPresenter> app_list_presenter,
27 shell::Connector* connector);
23 ~ShellDelegateMus() override; 28 ~ShellDelegateMus() override;
24 29
25 bool IsFirstRunAfterBoot() const override; 30 bool IsFirstRunAfterBoot() const override;
26 bool IsIncognitoAllowed() const override; 31 bool IsIncognitoAllowed() const override;
27 bool IsMultiProfilesEnabled() const override; 32 bool IsMultiProfilesEnabled() const override;
28 bool IsRunningInForcedAppMode() const override; 33 bool IsRunningInForcedAppMode() const override;
29 bool CanShowWindowForUser(WmWindow* window) const override; 34 bool CanShowWindowForUser(WmWindow* window) const override;
30 bool IsForceMaximizeOnFirstRun() const override; 35 bool IsForceMaximizeOnFirstRun() const override;
31 void PreInit() override; 36 void PreInit() override;
32 void PreShutdown() override; 37 void PreShutdown() override;
(...skipping 11 matching lines...) Expand all
44 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate() 49 std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
45 override; 50 override;
46 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 51 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
47 const ShelfItem* item) override; 52 const ShelfItem* item) override;
48 GPUSupport* CreateGPUSupport() override; 53 GPUSupport* CreateGPUSupport() override;
49 base::string16 GetProductName() const override; 54 base::string16 GetProductName() const override;
50 gfx::Image GetDeprecatedAcceleratorImage() const override; 55 gfx::Image GetDeprecatedAcceleratorImage() const override;
51 56
52 private: 57 private:
53 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_; 58 std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
59 shell::Connector* connector_;
54 60
55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 61 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
56 }; 62 };
57 63
58 } // namespace ash 64 } // namespace ash
59 65
60 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 66 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698