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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2307433004: Fix chrome crashing in mustash on device. (Closed)
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698