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

Side by Side Diff: components/arc/arc_bridge_service_impl.cc

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr 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 | « components/arc/arc_bridge_service_impl.h ('k') | components/arc/arc_bridge_service_unittest.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 #include "components/arc/arc_bridge_service_impl.h" 5 #include "components/arc/arc_bridge_service_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/sequenced_task_runner.h" 12 #include "base/sequenced_task_runner.h"
13 #include "base/sys_info.h" 13 #include "base/sys_info.h"
14 #include "base/task_runner_util.h" 14 #include "base/task_runner_util.h"
15 #include "base/thread_task_runner_handle.h" 15 #include "base/thread_task_runner_handle.h"
16 #include "chromeos/chromeos_switches.h" 16 #include "chromeos/chromeos_switches.h"
17 #include "chromeos/dbus/dbus_method_call_status.h" 17 #include "chromeos/dbus/dbus_method_call_status.h"
18 #include "chromeos/dbus/dbus_thread_manager.h" 18 #include "chromeos/dbus/dbus_thread_manager.h"
19 #include "chromeos/dbus/session_manager_client.h" 19 #include "chromeos/dbus/session_manager_client.h"
20 #include "components/prefs/pref_registry_simple.h" 20 #include "components/prefs/pref_registry_simple.h"
21 #include "components/prefs/pref_service.h" 21 #include "components/prefs/pref_service.h"
22 22
23 namespace arc { 23 namespace arc {
24 24
25 ArcBridgeServiceImpl::ArcBridgeServiceImpl( 25 ArcBridgeServiceImpl::ArcBridgeServiceImpl(
26 scoped_ptr<ArcBridgeBootstrap> bootstrap) 26 std::unique_ptr<ArcBridgeBootstrap> bootstrap)
27 : bootstrap_(std::move(bootstrap)), 27 : bootstrap_(std::move(bootstrap)),
28 binding_(this), 28 binding_(this),
29 session_started_(false), 29 session_started_(false),
30 weak_factory_(this) { 30 weak_factory_(this) {
31 bootstrap_->set_delegate(this); 31 bootstrap_->set_delegate(this);
32 } 32 }
33 33
34 ArcBridgeServiceImpl::~ArcBridgeServiceImpl() { 34 ArcBridgeServiceImpl::~ArcBridgeServiceImpl() {
35 } 35 }
36 36
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // This will happen when the instance is shut down. Ignore that case. 116 // This will happen when the instance is shut down. Ignore that case.
117 return; 117 return;
118 } 118 }
119 VLOG(1) << "Mojo connection lost"; 119 VLOG(1) << "Mojo connection lost";
120 CloseAllChannels(); 120 CloseAllChannels();
121 reconnect_ = true; 121 reconnect_ = true;
122 StopInstance(); 122 StopInstance();
123 } 123 }
124 124
125 } // namespace arc 125 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_service_impl.h ('k') | components/arc/arc_bridge_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698