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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: make virtual terminal work Created 3 years, 8 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
« ash/shell.cc ('K') | « chrome/app/mash/chrome_mus_manifest.json ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | services/ui/ws/window_server.cc » ('J')
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 87eafaca02864b1b556f87c807bb133995a9c5f0..a9cf2aeaef37ed3b771e22dbc330cae4132d2dc4 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -254,7 +254,9 @@ class DBusServices {
}
service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
- if (GetAshConfig() == ash::Config::CLASSIC) {
+ // TODO(sky): once mash supports simplified display mode we should always
+ // use ChromeConsoleServiceProviderDelegate.
+ if (GetAshConfig() != ash::Config::MASH) {
service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
base::MakeUnique<ChromeConsoleServiceProviderDelegate>()));
} else {
« ash/shell.cc ('K') | « chrome/app/mash/chrome_mus_manifest.json ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | services/ui/ws/window_server.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698