| OLD | NEW |
| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
| 14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
| 15 #include "base/location.h" | 15 #include "base/location.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
| 18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
| 19 #include "base/sys_info.h" | 19 #include "base/sys_info.h" |
| 20 #include "base/task_runner_util.h" | 20 #include "base/task_runner_util.h" |
| 21 #include "base/threading/worker_pool.h" | |
| 22 #include "base/values.h" | 21 #include "base/values.h" |
| 23 #include "chromeos/dbus/fake_cros_disks_client.h" | 22 #include "chromeos/dbus/fake_cros_disks_client.h" |
| 24 #include "dbus/bus.h" | 23 #include "dbus/bus.h" |
| 25 #include "dbus/message.h" | 24 #include "dbus/message.h" |
| 26 #include "dbus/object_path.h" | 25 #include "dbus/object_path.h" |
| 27 #include "dbus/object_proxy.h" | 26 #include "dbus/object_proxy.h" |
| 28 #include "dbus/values_util.h" | 27 #include "dbus/values_util.h" |
| 29 #include "third_party/cros_system_api/dbus/service_constants.h" | 28 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 30 | 29 |
| 31 namespace chromeos { | 30 namespace chromeos { |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 | 669 |
| 671 if (!mount_label.empty()) { | 670 if (!mount_label.empty()) { |
| 672 std::string mount_label_option = | 671 std::string mount_label_option = |
| 673 base::StringPrintf("%s=%s", kMountLabelOption, mount_label.c_str()); | 672 base::StringPrintf("%s=%s", kMountLabelOption, mount_label.c_str()); |
| 674 mount_options.push_back(mount_label_option); | 673 mount_options.push_back(mount_label_option); |
| 675 } | 674 } |
| 676 return mount_options; | 675 return mount_options; |
| 677 } | 676 } |
| 678 | 677 |
| 679 } // namespace chromeos | 678 } // namespace chromeos |
| OLD | NEW |