Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: chrome/browser/chromeos/system/input_device_settings.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
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 e6eed8503659c3fd73ce2c57a47bdcf4cce82619..bbc6ed13c7e1c4f4d9fc31db20f8798c88bb216b 100644
--- a/chrome/browser/chromeos/system/input_device_settings.cc
+++ b/chrome/browser/chromeos/system/input_device_settings.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/bind.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
@@ -19,6 +18,7 @@
#include "base/process/launch.h"
#include "base/process/process_handle.h"
#include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
#include "base/task_runner.h"
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/browser_process.h"
@@ -52,7 +52,7 @@ void ExecuteScriptOnFileThread(const std::vector<std::string>& argv) {
const std::string& script(argv[0]);
// Script must exist on device.
- DCHECK(!base::chromeos::IsRunningOnChromeOS() || ScriptExists(script));
+ DCHECK(!base::SysInfo::IsRunningOnChromeOS() || ScriptExists(script));
if (!ScriptExists(script))
return;
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/chromeos/system/statistics_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698