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

Unified Diff: chromeos/dbus/cros_disks_client.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 | « chromeos/dbus/bluetooth_profile_service_provider.cc ('k') | chromeos/dbus/dbus_thread_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/cros_disks_client.cc
diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index 4f5248377215c5480304fec5861f0549f623741a..8a5f9e6018fff7460d349a9e1c4337ba955670c6 100644
--- a/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.cc
@@ -7,13 +7,13 @@
#include <map>
#include "base/bind.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/location.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
#include "base/task_runner_util.h"
#include "base/threading/worker_pool.h"
#include "base/values.h"
@@ -722,14 +722,14 @@ CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type) {
// static
base::FilePath CrosDisksClient::GetArchiveMountPoint() {
- return base::FilePath(base::chromeos::IsRunningOnChromeOS() ?
+ return base::FilePath(base::SysInfo::IsRunningOnChromeOS() ?
FILE_PATH_LITERAL("/media/archive") :
FILE_PATH_LITERAL("/tmp/chromeos/media/archive"));
}
// static
base::FilePath CrosDisksClient::GetRemovableDiskMountPoint() {
- return base::FilePath(base::chromeos::IsRunningOnChromeOS() ?
+ return base::FilePath(base::SysInfo::IsRunningOnChromeOS() ?
FILE_PATH_LITERAL("/media/removable") :
FILE_PATH_LITERAL("/tmp/chromeos/media/removable"));
}
« no previous file with comments | « chromeos/dbus/bluetooth_profile_service_provider.cc ('k') | chromeos/dbus/dbus_thread_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698