chromeos/display/output_configurator.cc - Issue 23904025: Move IsRunningOnChromeOS to SysInfo

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: chromeos/display/output_configurator.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge fix Created 7 years, 3 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: chromeos/display/output_configurator.cc

diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc

index 4ff0acab3e9551a74f62ba01a358391c402b0687..92637a6da1b7a75b1de72f53ef9ff47d35089a72 100644

--- a/chromeos/display/output_configurator.cc

+++ b/chromeos/display/output_configurator.cc

@@ -9,9 +9,9 @@

#include <X11/extensions/XInput2.h>

#include "base/bind.h"

-#include "base/chromeos/chromeos_version.h"

#include "base/logging.h"

#include "base/strings/string_number_conversions.h"

+#include "base/sys_info.h"

#include "base/time/time.h"

#include "chromeos/display/output_util.h"

#include "chromeos/display/real_output_configurator_delegate.h"

@@ -224,7 +224,7 @@ OutputConfigurator::OutputConfigurator()

: state_controller_(NULL),

mirroring_controller_(NULL),

is_panel_fitting_enabled_(false),

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

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

xrandr_event_base_(0),

output_state_(STATE_INVALID),

power_state_(DISPLAY_POWER_ALL_ON) {

« no previous file with comments | « chromeos/dbus/dbus_thread_manager.cc ('k') | chromeos/ime/ibus_daemon_controller.cc » ('j') | no next file with comments »