OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/chromeos/file_manager/volume_manager.h" | 5 #include "chrome/browser/chromeos/file_manager/volume_manager.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 volume_info.volume_id = GenerateVolumeId(volume_info); | 208 volume_info.volume_id = GenerateVolumeId(volume_info); |
209 return volume_info; | 209 return volume_info; |
210 } | 210 } |
211 | 211 |
212 VolumeInfo CreateProvidedFileSystemVolumeInfo( | 212 VolumeInfo CreateProvidedFileSystemVolumeInfo( |
213 const chromeos::file_system_provider::ProvidedFileSystemInfo& | 213 const chromeos::file_system_provider::ProvidedFileSystemInfo& |
214 file_system_info) { | 214 file_system_info) { |
215 VolumeInfo volume_info; | 215 VolumeInfo volume_info; |
216 volume_info.file_system_id = file_system_info.file_system_id(); | 216 volume_info.file_system_id = file_system_info.file_system_id(); |
217 volume_info.extension_id = file_system_info.extension_id(); | 217 volume_info.extension_id = file_system_info.extension_id(); |
218 volume_info.volume_label = file_system_info.file_system_name(); | 218 volume_info.volume_label = file_system_info.display_name(); |
219 volume_info.type = VOLUME_TYPE_PROVIDED; | 219 volume_info.type = VOLUME_TYPE_PROVIDED; |
220 volume_info.mount_path = file_system_info.mount_path(); | 220 volume_info.mount_path = file_system_info.mount_path(); |
221 volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE; | 221 volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE; |
222 volume_info.is_parent = true; | 222 volume_info.is_parent = true; |
223 volume_info.is_read_only = true; | 223 volume_info.is_read_only = true; |
224 volume_info.volume_id = GenerateVolumeId(volume_info); | 224 volume_info.volume_id = GenerateVolumeId(volume_info); |
225 return volume_info; | 225 return volume_info; |
226 } | 226 } |
227 | 227 |
228 std::string GetMountPointNameForMediaStorage( | 228 std::string GetMountPointNameForMediaStorage( |
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 return; | 839 return; |
840 if (error_code == chromeos::MOUNT_ERROR_NONE) | 840 if (error_code == chromeos::MOUNT_ERROR_NONE) |
841 mounted_volumes_.erase(volume_info.volume_id); | 841 mounted_volumes_.erase(volume_info.volume_id); |
842 | 842 |
843 FOR_EACH_OBSERVER(VolumeManagerObserver, | 843 FOR_EACH_OBSERVER(VolumeManagerObserver, |
844 observers_, | 844 observers_, |
845 OnVolumeUnmounted(error_code, volume_info)); | 845 OnVolumeUnmounted(error_code, volume_info)); |
846 } | 846 } |
847 | 847 |
848 } // namespace file_manager | 848 } // namespace file_manager |
OLD | NEW |