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

Side by Side 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, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/dbus/cros_disks_client.h" 5 #include "chromeos/dbus/cros_disks_client.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/chromeos/chromeos_version.h"
11 #include "base/file_util.h" 10 #include "base/file_util.h"
12 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
13 #include "base/location.h" 12 #include "base/location.h"
14 #include "base/message_loop/message_loop_proxy.h" 13 #include "base/message_loop/message_loop_proxy.h"
15 #include "base/stl_util.h" 14 #include "base/stl_util.h"
16 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/sys_info.h"
17 #include "base/task_runner_util.h" 17 #include "base/task_runner_util.h"
18 #include "base/threading/worker_pool.h" 18 #include "base/threading/worker_pool.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "dbus/bus.h" 20 #include "dbus/bus.h"
21 #include "dbus/message.h" 21 #include "dbus/message.h"
22 #include "dbus/object_path.h" 22 #include "dbus/object_path.h"
23 #include "dbus/object_proxy.h" 23 #include "dbus/object_proxy.h"
24 #include "dbus/values_util.h" 24 #include "dbus/values_util.h"
25 #include "third_party/cros_system_api/dbus/service_constants.h" 25 #include "third_party/cros_system_api/dbus/service_constants.h"
26 26
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 // static 715 // static
716 CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type) { 716 CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type) {
717 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) 717 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
718 return new CrosDisksClientImpl(); 718 return new CrosDisksClientImpl();
719 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); 719 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
720 return new CrosDisksClientStubImpl(); 720 return new CrosDisksClientStubImpl();
721 } 721 }
722 722
723 // static 723 // static
724 base::FilePath CrosDisksClient::GetArchiveMountPoint() { 724 base::FilePath CrosDisksClient::GetArchiveMountPoint() {
725 return base::FilePath(base::chromeos::IsRunningOnChromeOS() ? 725 return base::FilePath(base::SysInfo::IsRunningOnChromeOS() ?
726 FILE_PATH_LITERAL("/media/archive") : 726 FILE_PATH_LITERAL("/media/archive") :
727 FILE_PATH_LITERAL("/tmp/chromeos/media/archive")); 727 FILE_PATH_LITERAL("/tmp/chromeos/media/archive"));
728 } 728 }
729 729
730 // static 730 // static
731 base::FilePath CrosDisksClient::GetRemovableDiskMountPoint() { 731 base::FilePath CrosDisksClient::GetRemovableDiskMountPoint() {
732 return base::FilePath(base::chromeos::IsRunningOnChromeOS() ? 732 return base::FilePath(base::SysInfo::IsRunningOnChromeOS() ?
733 FILE_PATH_LITERAL("/media/removable") : 733 FILE_PATH_LITERAL("/media/removable") :
734 FILE_PATH_LITERAL("/tmp/chromeos/media/removable")); 734 FILE_PATH_LITERAL("/tmp/chromeos/media/removable"));
735 } 735 }
736 736
737 } // namespace chromeos 737 } // namespace chromeos
OLDNEW
« 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