ui/display/manager/chromeos/display_configurator.cc - Issue 2585633004: ozone: Allow ozone evdev/kvm features to be enabled without running on ChromeOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/display/manager/chromeos/display_configurator.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:

Index: ui/display/manager/chromeos/display_configurator.cc

diff --git a/ui/display/manager/chromeos/display_configurator.cc b/ui/display/manager/chromeos/display_configurator.cc

index ea5857e2b6c47d2bd6083ac30fd89c801877bd07..d718eb8f02b969562b4f8194f5cbd649fa4666c6 100644

--- a/ui/display/manager/chromeos/display_configurator.cc

+++ b/ui/display/manager/chromeos/display_configurator.cc

@@ -11,8 +11,8 @@

#include "base/command_line.h"

#include "base/logging.h"

#include "base/macros.h"

-#include "base/sys_info.h"

#include "base/time/time.h"

+#include "chromeos/system/devicemode.h"

#include "ui/display/display.h"

#include "ui/display/display_switches.h"

#include "ui/display/manager/chromeos/apply_content_protection_task.h"

@@ -466,7 +466,7 @@ DisplayConfigurator::DisplayConfigurator()

: state_controller_(NULL),

mirroring_controller_(NULL),

is_panel_fitting_enabled_(false),

- configure_display_(base::SysInfo::IsRunningOnChromeOS()),

+ configure_display_(chromeos::IsRunningAsSystemCompositor()),

current_display_state_(MULTIPLE_DISPLAY_STATE_INVALID),

current_power_state_(chromeos::DISPLAY_POWER_ALL_ON),

requested_display_state_(MULTIPLE_DISPLAY_STATE_INVALID),

« no previous file with comments | « ui/display/manager/DEPS ('k') | ui/display/manager/display_manager.cc » ('j') | no next file with comments »