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 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ |
6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 NUM_VOLUME_TYPE, | 57 NUM_VOLUME_TYPE, |
58 }; | 58 }; |
59 | 59 |
60 struct VolumeInfo { | 60 struct VolumeInfo { |
61 VolumeInfo(); | 61 VolumeInfo(); |
62 ~VolumeInfo(); | 62 ~VolumeInfo(); |
63 | 63 |
64 // The ID of the volume. | 64 // The ID of the volume. |
65 std::string volume_id; | 65 std::string volume_id; |
66 | 66 |
67 // The ID for provided file systems. If other type, then equal to zero. | 67 // The ID for provided file systems. If other type, then empty string. Unique |
68 int file_system_id; | 68 // per providing extension. |
| 69 std::string file_system_id; |
69 | 70 |
70 // The ID of an extension providing the file system. If other type, then equal | 71 // The ID of an extension providing the file system. If other type, then equal |
71 // to an empty string. | 72 // to an empty string. |
72 std::string extension_id; | 73 std::string extension_id; |
73 | 74 |
74 // The type of mounted volume. | 75 // The type of mounted volume. |
75 VolumeType type; | 76 VolumeType type; |
76 | 77 |
77 // The type of device. (e.g. USB, SD card, DVD etc.) | 78 // The type of device. (e.g. USB, SD card, DVD etc.) |
78 chromeos::DeviceType device_type; | 79 chromeos::DeviceType device_type; |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 | 225 |
225 // Note: This should remain the last member so it'll be destroyed and | 226 // Note: This should remain the last member so it'll be destroyed and |
226 // invalidate its weak pointers before any other members are destroyed. | 227 // invalidate its weak pointers before any other members are destroyed. |
227 base::WeakPtrFactory<VolumeManager> weak_ptr_factory_; | 228 base::WeakPtrFactory<VolumeManager> weak_ptr_factory_; |
228 DISALLOW_COPY_AND_ASSIGN(VolumeManager); | 229 DISALLOW_COPY_AND_ASSIGN(VolumeManager); |
229 }; | 230 }; |
230 | 231 |
231 } // namespace file_manager | 232 } // namespace file_manager |
232 | 233 |
233 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ | 234 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ |
OLD | NEW |