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

Unified Diff: ash/shell.cc

Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS. (Closed)
Patch Set: fix bad rebase Created 4 years 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d9ee2f269362c2cf2bebf99e3d0826ae692af6a9..e05f8c0e2e33f3c5c8eca2d35d8a6ae855721cfb 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -616,7 +616,7 @@ void Shell::Init(const ShellInitParams& init_params) {
display_configurator_->AddObserver(projecting_observer_.get());
wm_shell_->AddShellObserver(projecting_observer_.get());
- if (!display_initialized && base::SysInfo::IsRunningOnChromeOS()) {
+ if (!display_initialized && base::SysInfo::IsRunningAsSystemCompositor()) {
rjkroege 2017/01/02 01:26:27 does this risk breaking support for ChromeOS Chrom
reveman 2017/01/02 07:11:32 ChromeOS Chrome on X11 should still work just fine
display_change_observer_ = base::MakeUnique<display::DisplayChangeObserver>(
display_configurator_.get(), display_manager_.get());

Powered by Google App Engine
This is Rietveld 408576698