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

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

Issue 549453005: Run athena on device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 "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/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // static 115 // static
116 void CrosDBusService::Initialize() { 116 void CrosDBusService::Initialize() {
117 if (g_cros_dbus_service) { 117 if (g_cros_dbus_service) {
118 LOG(WARNING) << "CrosDBusService was already initialized"; 118 LOG(WARNING) << "CrosDBusService was already initialized";
119 return; 119 return;
120 } 120 }
121 dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus(); 121 dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
122 if (base::SysInfo::IsRunningOnChromeOS() && bus) { 122 if (base::SysInfo::IsRunningOnChromeOS() && bus) {
123 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus); 123 CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
124 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create()); 124 service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
125 #if !defined(USE_ATHENA)
126 // crbug.com/413897
125 service->RegisterServiceProvider(new DisplayPowerServiceProvider); 127 service->RegisterServiceProvider(new DisplayPowerServiceProvider);
128 // crbug.com/401285
129 service->RegisterServiceProvider(new PrinterServiceProvider);
130 #endif
126 service->RegisterServiceProvider(new LivenessServiceProvider); 131 service->RegisterServiceProvider(new LivenessServiceProvider);
127 service->RegisterServiceProvider(new PrinterServiceProvider);
128 service->RegisterServiceProvider(new ScreenLockServiceProvider); 132 service->RegisterServiceProvider(new ScreenLockServiceProvider);
129 g_cros_dbus_service = service; 133 g_cros_dbus_service = service;
130 service->Start(); 134 service->Start();
131 } else { 135 } else {
132 g_cros_dbus_service = new CrosDBusServiceStubImpl; 136 g_cros_dbus_service = new CrosDBusServiceStubImpl;
133 } 137 }
134 VLOG(1) << "CrosDBusService initialized"; 138 VLOG(1) << "CrosDBusService initialized";
135 } 139 }
136 140
137 // static 141 // static
(...skipping 18 matching lines...) Expand all
156 VLOG(1) << "CrosDBusService Shutdown completed"; 160 VLOG(1) << "CrosDBusService Shutdown completed";
157 } 161 }
158 162
159 CrosDBusService::~CrosDBusService() { 163 CrosDBusService::~CrosDBusService() {
160 } 164 }
161 165
162 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() { 166 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
163 } 167 }
164 168
165 } // namespace chromeos 169 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698