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

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

Issue 2899223003: Revert of MediaPerceptionPrivate API impl and testing. (Closed)
Patch Set: Created 3 years, 6 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 | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/proto/media_perception.proto » ('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 (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"
(...skipping 23 matching lines...) Expand all
34 #include "chromeos/dbus/session_manager_client.h" 34 #include "chromeos/dbus/session_manager_client.h"
35 #include "chromeos/dbus/shill_device_client.h" 35 #include "chromeos/dbus/shill_device_client.h"
36 #include "chromeos/dbus/shill_ipconfig_client.h" 36 #include "chromeos/dbus/shill_ipconfig_client.h"
37 #include "chromeos/dbus/shill_manager_client.h" 37 #include "chromeos/dbus/shill_manager_client.h"
38 #include "chromeos/dbus/shill_profile_client.h" 38 #include "chromeos/dbus/shill_profile_client.h"
39 #include "chromeos/dbus/shill_service_client.h" 39 #include "chromeos/dbus/shill_service_client.h"
40 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" 40 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h"
41 #include "chromeos/dbus/sms_client.h" 41 #include "chromeos/dbus/sms_client.h"
42 #include "chromeos/dbus/system_clock_client.h" 42 #include "chromeos/dbus/system_clock_client.h"
43 #include "chromeos/dbus/update_engine_client.h" 43 #include "chromeos/dbus/update_engine_client.h"
44 #include "chromeos/dbus/upstart_client.h"
45 #include "dbus/bus.h" 44 #include "dbus/bus.h"
46 #include "dbus/dbus_statistics.h" 45 #include "dbus/dbus_statistics.h"
47 46
48 namespace chromeos { 47 namespace chromeos {
49 48
50 static DBusThreadManager* g_dbus_thread_manager = nullptr; 49 static DBusThreadManager* g_dbus_thread_manager = nullptr;
51 static bool g_using_dbus_thread_manager_for_testing = false; 50 static bool g_using_dbus_thread_manager_for_testing = false;
52 51
53 DBusThreadManager::DBusThreadManager(ProcessMask process_mask, 52 DBusThreadManager::DBusThreadManager(ProcessMask process_mask,
54 bool use_real_clients) 53 bool use_real_clients)
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 DBusThreadManager::Get()->clients_common_->session_manager_client_ = 409 DBusThreadManager::Get()->clients_common_->session_manager_client_ =
411 std::move(client); 410 std::move(client);
412 } 411 }
413 412
414 void DBusThreadManagerSetter::SetUpdateEngineClient( 413 void DBusThreadManagerSetter::SetUpdateEngineClient(
415 std::unique_ptr<UpdateEngineClient> client) { 414 std::unique_ptr<UpdateEngineClient> client) {
416 DBusThreadManager::Get()->clients_common_->update_engine_client_ = 415 DBusThreadManager::Get()->clients_common_->update_engine_client_ =
417 std::move(client); 416 std::move(client);
418 } 417 }
419 418
420 void DBusThreadManagerSetter::SetUpstartClient(
421 std::unique_ptr<UpstartClient> client) {
422 DBusThreadManager::Get()->clients_browser_->upstart_client_ =
423 std::move(client);
424 }
425
426 } // namespace chromeos 419 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/proto/media_perception.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698