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

Side by Side Diff: ash/mus/bridge/wm_shell_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/app_list_presenter_mus.cc ('k') | ash/mus/keyboard_ui_mus.h » ('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 <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "services/ui/public/cpp/window_tree_client_observer.h" 16 #include "services/ui/public/cpp/window_tree_client_observer.h"
17 17
18 namespace shell {
19 class Connector;
20 }
21
22 namespace ui { 18 namespace ui {
23 class WindowTreeClient; 19 class WindowTreeClient;
24 } 20 }
25 21
26 namespace views { 22 namespace views {
27 class PointerWatcherEventRouter; 23 class PointerWatcherEventRouter;
28 } 24 }
29 25
30 namespace ash { 26 namespace ash {
31 namespace mus { 27 namespace mus {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 143
148 base::ObserverList<WmActivationObserver> activation_observers_; 144 base::ObserverList<WmActivationObserver> activation_observers_;
149 145
150 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 146 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
151 }; 147 };
152 148
153 } // namespace mus 149 } // namespace mus
154 } // namespace ash 150 } // namespace ash
155 151
156 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 152 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/app_list_presenter_mus.cc ('k') | ash/mus/keyboard_ui_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698