| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index ba0104cd20e90a2cff32b285a63fb8691bfa7a63..f7c6ecaf43d281affc133966bc7727fee0eea19f 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -214,8 +214,11 @@ class DBusServices {
|
| service_providers.push_back(
|
| base::WrapUnique(ProxyResolutionServiceProvider::Create(
|
| base::MakeUnique<ChromeProxyResolverDelegate>())));
|
| - service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>(
|
| - base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>()));
|
| + if (!chrome::IsRunningInMash()) {
|
| + // TODO(crbug.com/629707): revisit this with mustash dbus work.
|
| + service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>(
|
| + base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>()));
|
| + }
|
| service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
|
| service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
|
| service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
|
|
|