chrome/browser/extensions/api/braille_display_private/brlapi_connection.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/extensions/api/braille_display_private/brlapi_connection.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/system/timezone_settings.cc ('k') | chrome/browser/extensions/api/terminal/terminal_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc

diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc

index 48c773bf16d0cbc6d008b22872cd7ff272376817..e92b9e04bd132aeb1361d8d2350547ee436e6725 100644

--- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc

+++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc

@@ -4,8 +4,8 @@

#include "chrome/browser/extensions/api/braille_display_private/brlapi_connection.h"

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

#include "base/message_loop/message_loop.h"

+#include "base/sys_info.h"

namespace extensions {

using base::MessageLoopForIO;

@@ -87,7 +87,7 @@ bool BrlapiConnectionImpl::Connect(const OnDataReadyCallback& on_data_ready) {

int path[2] = {0, 0};

int pathElements = 0;

#if defined(OS_CHROMEOS)

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

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

path[pathElements++] = kDefaultTtyChromeOS;

#endif

if (pathElements == 0 && getenv("WINDOWPATH") == NULL)