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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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/wallpaper_delegate_mus.cc ('k') | ash/mus/window_manager_application.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <set> 11 #include <set>
12 12
13 #include "ash/public/interfaces/wallpaper.mojom.h" 13 #include "ash/public/interfaces/wallpaper.mojom.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "mash/session/public/interfaces/session.mojom.h" 16 #include "mash/session/public/interfaces/session.mojom.h"
17 #include "mojo/public/cpp/bindings/binding.h" 17 #include "mojo/public/cpp/bindings/binding.h"
18 #include "mojo/public/cpp/bindings/binding_set.h" 18 #include "mojo/public/cpp/bindings/binding_set.h"
19 #include "services/shell/public/cpp/service.h" 19 #include "services/service_manager/public/cpp/service.h"
20 #include "services/tracing/public/cpp/provider.h" 20 #include "services/tracing/public/cpp/provider.h"
21 #include "services/ui/common/types.h" 21 #include "services/ui/common/types.h"
22 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" 22 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
23 23
24 namespace base { 24 namespace base {
25 class SequencedWorkerPool; 25 class SequencedWorkerPool;
26 } 26 }
27 27
28 namespace chromeos { 28 namespace chromeos {
29 namespace system { 29 namespace system {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 statistics_provider_; 121 statistics_provider_;
122 #endif 122 #endif
123 123
124 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 124 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
125 }; 125 };
126 126
127 } // namespace mus 127 } // namespace mus
128 } // namespace ash 128 } // namespace ash
129 129
130 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 130 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/wallpaper_delegate_mus.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698