chrome/browser/chromeos/system/input_device_settings.cc - Issue 9546013: Move IsRunningOnChromeOS to base/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: chrome/browser/chromeos/system/input_device_settings.cc

Issue 9546013: Move IsRunningOnChromeOS to base/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos_version,sync,cleanup Created 8 years, 9 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/chromeos/system/input_device_settings.cc

diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc

index d5b4e4231c77b0b6df86ec68c53fbdb482fa5eff..a099b31f208f193a7e163c888cbcee26c14ab358 100644

--- a/chrome/browser/chromeos/system/input_device_settings.cc

+++ b/chrome/browser/chromeos/system/input_device_settings.cc

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

#include <vector>

#include "base/bind.h"

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

#include "base/command_line.h"

#include "base/file_path.h"

#include "base/file_util.h"

#include "base/message_loop.h"

#include "base/process_util.h"

#include "base/stringprintf.h"

-#include "chrome/browser/chromeos/system/runtime_environment.h"

#include "content/public/browser/browser_thread.h"

using content::BrowserThread;

@@ -38,7 +38,7 @@ void ExecuteScriptOnFileThread(const std::vector<std::string>& argv) {

const std::string& script(argv[0]);

// Script must exist on device.

- DCHECK(!runtime_environment::IsRunningOnChromeOS() || ScriptExists(script));

+ DCHECK(!base::chromeos::IsRunningOnChromeOS() || ScriptExists(script));

if (!ScriptExists(script))

return;