| Index: chrome/browser/chromeos/dbus/cros_dbus_service.cc
|
| diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
|
| index 3694872eed2c27926554b3cfc6848a312e34e2be..aebd18361fd14e8a83e3f16d3443f2842393192e 100644
|
| --- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc
|
| +++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc
|
| @@ -122,9 +122,13 @@ void CrosDBusService::Initialize() {
|
| if (base::SysInfo::IsRunningOnChromeOS() && bus) {
|
| CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
|
| service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
|
| +#if !defined(USE_ATHENA)
|
| + // crbug.com/413897
|
| service->RegisterServiceProvider(new DisplayPowerServiceProvider);
|
| - service->RegisterServiceProvider(new LivenessServiceProvider);
|
| + // crbug.com/401285
|
| service->RegisterServiceProvider(new PrinterServiceProvider);
|
| +#endif
|
| + service->RegisterServiceProvider(new LivenessServiceProvider);
|
| service->RegisterServiceProvider(new ScreenLockServiceProvider);
|
| g_cros_dbus_service = service;
|
| service->Start();
|
|
|