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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2150023002: Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments 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/BUILD.gn ('k') | ash/mus/bridge/wm_shell_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_BRIDGE_WM_SHELL_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/observer_list.h" 15 #include "base/observer_list.h"
15 #include "services/ui/public/cpp/window_tree_client_observer.h" 16 #include "services/ui/public/cpp/window_tree_client_observer.h"
16 17
17 namespace shell { 18 namespace shell {
18 class Connector; 19 class Connector;
19 } 20 }
20 21
21 namespace ui { 22 namespace ui {
22 class WindowTreeClient; 23 class WindowTreeClient;
23 } 24 }
24 25
25 namespace ash { 26 namespace ash {
26 namespace mus { 27 namespace mus {
27 28
28 class WmRootWindowControllerMus; 29 class WmRootWindowControllerMus;
29 class WmWindowMus; 30 class WmWindowMus;
30 31
31 // WmShell implementation for mus. 32 // WmShell implementation for mus.
32 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver { 33 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
33 public: 34 public:
34 WmShellMus(ShellDelegate* delegate, 35 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
35 ::ui::WindowTreeClient* client, 36 ::ui::WindowTreeClient* client,
36 shell::Connector* connector); 37 shell::Connector* connector);
37 ~WmShellMus() override; 38 ~WmShellMus() override;
38 39
39 static WmShellMus* Get(); 40 static WmShellMus* Get();
40 41
41 void AddRootWindowController(WmRootWindowControllerMus* controller); 42 void AddRootWindowController(WmRootWindowControllerMus* controller);
42 void RemoveRootWindowController(WmRootWindowControllerMus* controller); 43 void RemoveRootWindowController(WmRootWindowControllerMus* controller);
43 44
44 // Returns the ancestor of |window| (including |window|) that is considered 45 // Returns the ancestor of |window| (including |window|) that is considered
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 108
108 base::ObserverList<WmActivationObserver> activation_observers_; 109 base::ObserverList<WmActivationObserver> activation_observers_;
109 110
110 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 111 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
111 }; 112 };
112 113
113 } // namespace mus 114 } // namespace mus
114 } // namespace ash 115 } // namespace ash
115 116
116 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 117 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698