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

Unified Diff: services/ui/display/screen_manager_ozone.cc

Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS. (Closed)
Patch Set: only add //chromeos to deps if is_chromeos Created 3 years, 11 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
Index: services/ui/display/screen_manager_ozone.cc
diff --git a/services/ui/display/screen_manager_ozone.cc b/services/ui/display/screen_manager_ozone.cc
index c877370866782d1535f2456d5eb8bad59278400c..8e2068fc4214b4a9a63bdf69f81e52289e0cfe06 100644
--- a/services/ui/display/screen_manager_ozone.cc
+++ b/services/ui/display/screen_manager_ozone.cc
@@ -9,8 +9,8 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
-#include "base/sys_info.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "chromeos/system/devicemode.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/display/manager/chromeos/display_change_observer.h"
@@ -148,7 +148,7 @@ void ScreenManagerOzone::Init(ScreenManagerDelegate* delegate) {
// The FakeDisplayController gives us a way to make the NativeDisplayDelegate
// pretend something display related has happened.
- if (!base::SysInfo::IsRunningOnChromeOS()) {
+ if (!chromeos::IsRunningAsSystemCompositor()) {
fake_display_controller_ =
native_display_delegate_->GetFakeDisplayController();
}

Powered by Google App Engine
This is Rietveld 408576698