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

Side by Side Diff: chromeos/dbus/dbus_thread_manager.cc

Issue 2400163003: arc: enable Android tracing in verified-boot mode (Closed)
Patch Set: add FakeArcTraceAgent for linux and test Created 3 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chromeos/dbus/dbus_thread_manager.h" 5 #include "chromeos/dbus/dbus_thread_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/sys_info.h" 11 #include "base/sys_info.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "chromeos/chromeos_switches.h" 13 #include "chromeos/chromeos_switches.h"
14 #include "chromeos/dbus/arc_obb_mounter_client.h" 14 #include "chromeos/dbus/arc_obb_mounter_client.h"
15 #include "chromeos/dbus/arc_trace_agent.h"
15 #include "chromeos/dbus/auth_policy_client.h" 16 #include "chromeos/dbus/auth_policy_client.h"
16 #include "chromeos/dbus/cras_audio_client.h" 17 #include "chromeos/dbus/cras_audio_client.h"
17 #include "chromeos/dbus/cros_disks_client.h" 18 #include "chromeos/dbus/cros_disks_client.h"
18 #include "chromeos/dbus/cryptohome_client.h" 19 #include "chromeos/dbus/cryptohome_client.h"
19 #include "chromeos/dbus/dbus_client.h" 20 #include "chromeos/dbus/dbus_client.h"
20 #include "chromeos/dbus/dbus_clients_browser.h" 21 #include "chromeos/dbus/dbus_clients_browser.h"
21 #include "chromeos/dbus/dbus_clients_common.h" 22 #include "chromeos/dbus/dbus_clients_common.h"
22 #include "chromeos/dbus/debug_daemon_client.h" 23 #include "chromeos/dbus/debug_daemon_client.h"
23 #include "chromeos/dbus/easy_unlock_client.h" 24 #include "chromeos/dbus/easy_unlock_client.h"
24 #include "chromeos/dbus/gsm_sms_client.h" 25 #include "chromeos/dbus/gsm_sms_client.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 105
105 dbus::Bus* DBusThreadManager::GetSystemBus() { 106 dbus::Bus* DBusThreadManager::GetSystemBus() {
106 return system_bus_.get(); 107 return system_bus_.get();
107 } 108 }
108 109
109 ArcObbMounterClient* DBusThreadManager::GetArcObbMounterClient() { 110 ArcObbMounterClient* DBusThreadManager::GetArcObbMounterClient() {
110 return clients_browser_ ? clients_browser_->arc_obb_mounter_client_.get() 111 return clients_browser_ ? clients_browser_->arc_obb_mounter_client_.get()
111 : nullptr; 112 : nullptr;
112 } 113 }
113 114
115 ArcTraceAgent* DBusThreadManager::GetArcTraceAgent() {
116 return clients_browser_ ? clients_browser_->arc_trace_agent_.get() : nullptr;
117 }
118
114 AuthPolicyClient* DBusThreadManager::GetAuthPolicyClient() { 119 AuthPolicyClient* DBusThreadManager::GetAuthPolicyClient() {
115 return clients_browser_ ? clients_browser_->auth_policy_client_.get() 120 return clients_browser_ ? clients_browser_->auth_policy_client_.get()
116 : nullptr; 121 : nullptr;
117 } 122 }
118 123
119 CrasAudioClient* DBusThreadManager::GetCrasAudioClient() { 124 CrasAudioClient* DBusThreadManager::GetCrasAudioClient() {
120 return clients_common_->cras_audio_client_.get(); 125 return clients_common_->cras_audio_client_.get();
121 } 126 }
122 127
123 CrosDisksClient* DBusThreadManager::GetCrosDisksClient() { 128 CrosDisksClient* DBusThreadManager::GetCrosDisksClient() {
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 std::move(client); 392 std::move(client);
388 } 393 }
389 394
390 void DBusThreadManagerSetter::SetUpdateEngineClient( 395 void DBusThreadManagerSetter::SetUpdateEngineClient(
391 std::unique_ptr<UpdateEngineClient> client) { 396 std::unique_ptr<UpdateEngineClient> client) {
392 DBusThreadManager::Get()->clients_common_->update_engine_client_ = 397 DBusThreadManager::Get()->clients_common_->update_engine_client_ =
393 std::move(client); 398 std::move(client);
394 } 399 }
395 400
396 } // namespace chromeos 401 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698