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

Unified Diff: ash/display/display_configuration_controller.cc

Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS. (Closed)
Patch Set: rebase 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
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_configuration_controller.cc
diff --git a/ash/display/display_configuration_controller.cc b/ash/display/display_configuration_controller.cc
index 7f9302ab4ce76f7707319044b54bd668b909298e..1645345f98e1d20b29945dd4f78e530eeebd7a4d 100644
--- a/ash/display/display_configuration_controller.cc
+++ b/ash/display/display_configuration_controller.cc
@@ -13,7 +13,7 @@
#if defined(OS_CHROMEOS)
#include "ash/display/display_animator_chromeos.h"
-#include "base/sys_info.h"
+#include "chromeos/system/devicemode.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
#endif
@@ -59,7 +59,7 @@ DisplayConfigurationController::DisplayConfigurationController(
weak_ptr_factory_(this) {
window_tree_host_manager_->AddObserver(this);
#if defined(OS_CHROMEOS)
- if (base::SysInfo::IsRunningOnChromeOS())
+ if (chromeos::IsRunningAsSystemCompositor())
limiter_.reset(new DisplayChangeLimiter);
display_animator_.reset(new DisplayAnimatorChromeOS());
#endif
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698