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

Side by Side Diff: mash/screenlock/screenlock.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 | « mash/screenlock/main.cc ('k') | mash/screenlock/screenlock.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 MASH_SCREENLOCK_SCREENLOCK_H_ 5 #ifndef MASH_SCREENLOCK_SCREENLOCK_H_
6 #define MASH_SCREENLOCK_SCREENLOCK_H_ 6 #define MASH_SCREENLOCK_SCREENLOCK_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "mash/session/public/interfaces/session.mojom.h" 12 #include "mash/session/public/interfaces/session.mojom.h"
13 #include "mojo/public/cpp/bindings/binding_set.h" 13 #include "mojo/public/cpp/bindings/binding_set.h"
14 #include "services/shell/public/cpp/service.h" 14 #include "services/service_manager/public/cpp/service.h"
15 #include "services/tracing/public/cpp/provider.h" 15 #include "services/tracing/public/cpp/provider.h"
16 16
17 namespace views { 17 namespace views {
18 class AuraInit; 18 class AuraInit;
19 class WindowManagerConnection; 19 class WindowManagerConnection;
20 } 20 }
21 21
22 namespace mash { 22 namespace mash {
23 namespace screenlock { 23 namespace screenlock {
24 24
(...skipping 15 matching lines...) Expand all
40 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 40 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
41 mojo::BindingSet<session::mojom::ScreenlockStateListener> bindings_; 41 mojo::BindingSet<session::mojom::ScreenlockStateListener> bindings_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(Screenlock); 43 DISALLOW_COPY_AND_ASSIGN(Screenlock);
44 }; 44 };
45 45
46 } // namespace screenlock 46 } // namespace screenlock
47 } // namespace mash 47 } // namespace mash
48 48
49 #endif // MASH_SCREENLOCK_SCREENLOCK_H_ 49 #endif // MASH_SCREENLOCK_SCREENLOCK_H_
OLDNEW
« no previous file with comments | « mash/screenlock/main.cc ('k') | mash/screenlock/screenlock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698