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

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

Issue 2433363004: Chromad: added AD Join ui, authpolicy_client (Closed)
Patch Set: Not close password_fd in AuthPolicyClient Created 4 years, 1 month 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/auth_policy_client.h"
15 #include "chromeos/dbus/cras_audio_client.h" 16 #include "chromeos/dbus/cras_audio_client.h"
16 #include "chromeos/dbus/cros_disks_client.h" 17 #include "chromeos/dbus/cros_disks_client.h"
17 #include "chromeos/dbus/cryptohome_client.h" 18 #include "chromeos/dbus/cryptohome_client.h"
18 #include "chromeos/dbus/dbus_client.h" 19 #include "chromeos/dbus/dbus_client.h"
19 #include "chromeos/dbus/dbus_clients_browser.h" 20 #include "chromeos/dbus/dbus_clients_browser.h"
20 #include "chromeos/dbus/dbus_clients_common.h" 21 #include "chromeos/dbus/dbus_clients_common.h"
21 #include "chromeos/dbus/debug_daemon_client.h" 22 #include "chromeos/dbus/debug_daemon_client.h"
22 #include "chromeos/dbus/easy_unlock_client.h" 23 #include "chromeos/dbus/easy_unlock_client.h"
23 #include "chromeos/dbus/gsm_sms_client.h" 24 #include "chromeos/dbus/gsm_sms_client.h"
24 #include "chromeos/dbus/image_burner_client.h" 25 #include "chromeos/dbus/image_burner_client.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 VLOG(1) << "DBusThreadManager destroyed"; 98 VLOG(1) << "DBusThreadManager destroyed";
98 } else { 99 } else {
99 LOG(FATAL) << "~DBusThreadManager() called outside of Shutdown()"; 100 LOG(FATAL) << "~DBusThreadManager() called outside of Shutdown()";
100 } 101 }
101 } 102 }
102 103
103 dbus::Bus* DBusThreadManager::GetSystemBus() { 104 dbus::Bus* DBusThreadManager::GetSystemBus() {
104 return system_bus_.get(); 105 return system_bus_.get();
105 } 106 }
106 107
108 AuthPolicyClient* DBusThreadManager::GetAuthPolicyClient() {
xiyuan 2016/10/26 22:03:17 nit: move this after GetArcObbMounterClient to fol
Roman Sorokin (ftl) 2016/10/27 13:10:46 Done.
109 return clients_browser_ ? clients_browser_->auth_policy_client_.get()
110 : nullptr;
111 }
112
107 ArcObbMounterClient* DBusThreadManager::GetArcObbMounterClient() { 113 ArcObbMounterClient* DBusThreadManager::GetArcObbMounterClient() {
108 return clients_browser_ ? clients_browser_->arc_obb_mounter_client_.get() 114 return clients_browser_ ? clients_browser_->arc_obb_mounter_client_.get()
109 : nullptr; 115 : nullptr;
110 } 116 }
111 117
112 CrasAudioClient* DBusThreadManager::GetCrasAudioClient() { 118 CrasAudioClient* DBusThreadManager::GetCrasAudioClient() {
113 return clients_common_->cras_audio_client_.get(); 119 return clients_common_->cras_audio_client_.get();
114 } 120 }
115 121
116 CrosDisksClient* DBusThreadManager::GetCrosDisksClient() { 122 CrosDisksClient* DBusThreadManager::GetCrosDisksClient() {
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 std::move(client); 370 std::move(client);
365 } 371 }
366 372
367 void DBusThreadManagerSetter::SetUpdateEngineClient( 373 void DBusThreadManagerSetter::SetUpdateEngineClient(
368 std::unique_ptr<UpdateEngineClient> client) { 374 std::unique_ptr<UpdateEngineClient> client) {
369 DBusThreadManager::Get()->clients_common_->update_engine_client_ = 375 DBusThreadManager::Get()->clients_common_->update_engine_client_ =
370 std::move(client); 376 std::move(client);
371 } 377 }
372 378
373 } // namespace chromeos 379 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698