chrome/browser/extensions/api/terminal/terminal_private_api.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/terminal/terminal_private_api.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/extensions/api/terminal/terminal_private_api.cc

diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc

index 846500c07bccdee99e39c2731f1ee202e2d7c0bb..faeb3b5b201a2d18a7f48f82cc292bb149ab190e 100644

--- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc

+++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc

@@ -5,8 +5,8 @@

#include "chrome/browser/extensions/api/terminal/terminal_private_api.h"

#include "base/bind.h"

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

#include "base/json/json_writer.h"

+#include "base/sys_info.h"

#include "base/values.h"

#include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"

#include "chrome/browser/extensions/event_router.h"

@@ -32,7 +32,7 @@ const char kCroshCommand[] = "/usr/bin/crosh";

const char kStubbedCroshCommand[] = "cat";

const char* GetCroshPath() {

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

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

return kCroshCommand;

else

return kStubbedCroshCommand;