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

Side by Side Diff: mash/session/session.h

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/screenlock.h ('k') | mash/session/session.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 MASH_SESSION_SESSION_H_ 5 #ifndef MASH_SESSION_SESSION_H_
6 #define MASH_SESSION_SESSION_H_ 6 #define MASH_SESSION_SESSION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "mash/session/public/interfaces/session.mojom.h" 13 #include "mash/session/public/interfaces/session.mojom.h"
14 #include "mojo/public/cpp/bindings/binding_set.h" 14 #include "mojo/public/cpp/bindings/binding_set.h"
15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
16 #include "mojo/shell/public/cpp/interface_factory.h" 16 #include "mojo/shell/public/cpp/interface_factory.h"
17 #include "mojo/shell/public/cpp/shell_client.h" 17 #include "mojo/shell/public/cpp/shell_client.h"
18 18
19 namespace mojo { 19 namespace mojo {
20 class Connection; 20 class Connection;
21 } 21 }
22 22
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 void StartScreenlock(); 57 void StartScreenlock();
58 void StopScreenlock(); 58 void StopScreenlock();
59 59
60 // Starts the application at |url|, running |restart_callback| if the 60 // Starts the application at |url|, running |restart_callback| if the
61 // connection to the application is closed. 61 // connection to the application is closed.
62 void StartRestartableService(const std::string& url, 62 void StartRestartableService(const std::string& url,
63 const base::Closure& restart_callback); 63 const base::Closure& restart_callback);
64 64
65 mojo::Connector* connector_; 65 mojo::Connector* connector_;
66 std::map<std::string, scoped_ptr<mojo::Connection>> connections_; 66 std::map<std::string, std::unique_ptr<mojo::Connection>> connections_;
67 bool screen_locked_; 67 bool screen_locked_;
68 mojo::BindingSet<mojom::Session> bindings_; 68 mojo::BindingSet<mojom::Session> bindings_;
69 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; 69 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(Session); 71 DISALLOW_COPY_AND_ASSIGN(Session);
72 }; 72 };
73 73
74 } // namespace session 74 } // namespace session
75 } // namespace mash 75 } // namespace mash
76 76
77 #endif // MASH_SESSION_SESSION_H_ 77 #endif // MASH_SESSION_SESSION_H_
OLDNEW
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/session/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698