OLD | NEW |
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 #include "mash/session/session.h" | 5 #include "mash/session/session.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "mash/login/public/interfaces/login.mojom.h" | 10 #include "mash/login/public/interfaces/login.mojom.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 auto connection = connections_.find("mojo:screenlock"); | 118 auto connection = connections_.find("mojo:screenlock"); |
119 DCHECK(connections_.end() != connection); | 119 DCHECK(connections_.end() != connection); |
120 connections_.erase(connection); | 120 connections_.erase(connection); |
121 } | 121 } |
122 | 122 |
123 void Session::StartRestartableService( | 123 void Session::StartRestartableService( |
124 const std::string& url, | 124 const std::string& url, |
125 const base::Closure& restart_callback) { | 125 const base::Closure& restart_callback) { |
126 // TODO(beng): This would be the place to insert logic that counted restarts | 126 // TODO(beng): This would be the place to insert logic that counted restarts |
127 // to avoid infinite crash-restart loops. | 127 // to avoid infinite crash-restart loops. |
128 scoped_ptr<mojo::Connection> connection = connector_->Connect(url); | 128 std::unique_ptr<mojo::Connection> connection = connector_->Connect(url); |
129 // Note: |connection| may be null if we've lost our connection to the shell. | 129 // Note: |connection| may be null if we've lost our connection to the shell. |
130 if (connection) { | 130 if (connection) { |
131 connection->SetConnectionLostClosure(restart_callback); | 131 connection->SetConnectionLostClosure(restart_callback); |
132 connection->AddInterface<mojom::Session>(this); | 132 connection->AddInterface<mojom::Session>(this); |
133 connections_[url] = std::move(connection); | 133 connections_[url] = std::move(connection); |
134 } | 134 } |
135 } | 135 } |
136 | 136 |
137 } // namespace session | 137 } // namespace session |
138 } // namespace main | 138 } // namespace main |
OLD | NEW |