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

Unified Diff: ash/shell.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: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d9ee2f269362c2cf2bebf99e3d0826ae692af6a9..4eb7f8ddf92f0d776d0ba732487802b0e8e15fb3 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -134,6 +134,7 @@
#include "chromeos/audio/audio_a11y_controller.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/system/devicemode.h"
#include "ui/chromeos/user_activity_power_manager_notifier.h"
#include "ui/display/manager/chromeos/display_change_observer.h"
#include "ui/display/manager/chromeos/display_configurator.h"
@@ -616,7 +617,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 && chromeos::IsRunningAsSystemCompositor()) {
display_change_observer_ = base::MakeUnique<display::DisplayChangeObserver>(
display_configurator_.get(), display_manager_.get());

Powered by Google App Engine
This is Rietveld 408576698