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

Side by Side Diff: chrome/browser/chromeos/dbus/cros_dbus_service.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 2 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 | Annotate | Revision Log
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 "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"
9 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/sys_info.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
11 #include "chrome/browser/chromeos/dbus/display_power_service_provider.h" 11 #include "chrome/browser/chromeos/dbus/display_power_service_provider.h"
12 #include "chrome/browser/chromeos/dbus/liveness_service_provider.h" 12 #include "chrome/browser/chromeos/dbus/liveness_service_provider.h"
13 #include "chrome/browser/chromeos/dbus/printer_service_provider.h" 13 #include "chrome/browser/chromeos/dbus/printer_service_provider.h"
14 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h" 14 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "dbus/bus.h" 16 #include "dbus/bus.h"
17 #include "dbus/exported_object.h" 17 #include "dbus/exported_object.h"
18 #include "dbus/object_path.h" 18 #include "dbus/object_path.h"
19 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 111 }
112 }; 112 };
113 113
114 // static 114 // static
115 void CrosDBusService::Initialize() { 115 void CrosDBusService::Initialize() {
116 if (g_cros_dbus_service) { 116 if (g_cros_dbus_service) {
117 LOG(WARNING) << "CrosDBusService was already initialized"; 117 LOG(WARNING) << "CrosDBusService was already initialized";
118 return; 118 return;
119 } 119 }
120 dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus(); 120 dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
121 if (base::chromeos::IsRunningOnChromeOS() && bus) { 121 if (base::SysInfo::IsRunningOnChromeOS() && bus) {
122 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus); 122 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
123 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create()); 123 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
124 service->RegisterServiceProvider(new DisplayPowerServiceProvider); 124 service->RegisterServiceProvider(new DisplayPowerServiceProvider);
125 service->RegisterServiceProvider(new LivenessServiceProvider); 125 service->RegisterServiceProvider(new LivenessServiceProvider);
126 service->RegisterServiceProvider(new PrinterServiceProvider); 126 service->RegisterServiceProvider(new PrinterServiceProvider);
127 g_cros_dbus_service = service; 127 g_cros_dbus_service = service;
128 service->Start(); 128 service->Start();
129 } else { 129 } else {
130 g_cros_dbus_service = new CrosDBusServiceStubImpl; 130 g_cros_dbus_service = new CrosDBusServiceStubImpl;
131 } 131 }
(...skipping 22 matching lines...) Expand all
154 VLOG(1) << "CrosDBusService Shutdown completed"; 154 VLOG(1) << "CrosDBusService Shutdown completed";
155 } 155 }
156 156
157 CrosDBusService::~CrosDBusService() { 157 CrosDBusService::~CrosDBusService() {
158 } 158 }
159 159
160 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() { 160 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
161 } 161 }
162 162
163 } // namespace chromeos 163 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698