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

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

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/session/session.h ('k') | mash/task_viewer/task_viewer.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 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
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
OLDNEW
« no previous file with comments | « mash/session/session.h ('k') | mash/task_viewer/task_viewer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698