chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 71e198034ccdd845cb8e415fc05be0f100caa3b8..8fbecadb5dd2460a74727da126c1b3733162f271 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -24,7 +24,7 @@

#include "ui/aura/root_window.h"

#if defined(OS_CHROMEOS)

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

+#include "base/sys_info.h"

#include "chrome/browser/ui/ash/ime_controller_chromeos.h"

#include "chrome/browser/ui/ash/volume_controller_chromeos.h"

#include "chromeos/chromeos_switches.h"

@@ -44,7 +44,7 @@ bool ShouldOpenAshOnStartup() {

void OpenAsh() {

#if defined(OS_CHROMEOS)

- if (base::chromeos::IsRunningOnChromeOS()) {

+ if (base::SysInfo::IsRunningOnChromeOS()) {

// Hides the cursor outside of the Aura root window. The cursor will be

// drawn within the Aura root window, and it'll remain hidden after the

// Aura window is closed.