| OLD | NEW |
| 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 "chrome/browser/chromeos/dbus/cros_dbus_service.h" | 5 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/chromeos/chromeos_version.h" | 8 #include "base/chromeos/chromeos_version.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
| 11 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | |
| 12 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h" | 11 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h" |
| 12 #include "chromeos/dbus/dbus_thread_manager.h" |
| 13 #include "dbus/bus.h" | 13 #include "dbus/bus.h" |
| 14 #include "dbus/exported_object.h" | 14 #include "dbus/exported_object.h" |
| 15 #include "dbus/object_path.h" | 15 #include "dbus/object_path.h" |
| 16 #include "third_party/cros_system_api/dbus/service_constants.h" | 16 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 17 | 17 |
| 18 namespace chromeos { | 18 namespace chromeos { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 CrosDBusService* g_cros_dbus_service = NULL; | 22 CrosDBusService* g_cros_dbus_service = NULL; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 VLOG(1) << "CrosDBusService Shutdown completed"; | 139 VLOG(1) << "CrosDBusService Shutdown completed"; |
| 140 } | 140 } |
| 141 | 141 |
| 142 CrosDBusService::~CrosDBusService() { | 142 CrosDBusService::~CrosDBusService() { |
| 143 } | 143 } |
| 144 | 144 |
| 145 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() { | 145 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() { |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace chromeos | 148 } // namespace chromeos |
| OLD | NEW |