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/extensions/file_manager/private_api_util.h" | 5 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 volume_metadata->profile.is_current_profile = true; | 134 volume_metadata->profile.is_current_profile = true; |
135 | 135 |
136 if (!volume_info.source_path.empty()) { | 136 if (!volume_info.source_path.empty()) { |
137 volume_metadata->source_path.reset( | 137 volume_metadata->source_path.reset( |
138 new std::string(volume_info.source_path.AsUTF8Unsafe())); | 138 new std::string(volume_info.source_path.AsUTF8Unsafe())); |
139 } | 139 } |
140 | 140 |
141 if (volume_info.type == VOLUME_TYPE_PROVIDED) { | 141 if (volume_info.type == VOLUME_TYPE_PROVIDED) { |
142 volume_metadata->extension_id.reset( | 142 volume_metadata->extension_id.reset( |
143 new std::string(volume_info.extension_id)); | 143 new std::string(volume_info.extension_id)); |
| 144 |
| 145 volume_metadata->file_system_id.reset( |
| 146 new std::string(volume_info.file_system_id)); |
144 } | 147 } |
145 | 148 |
146 volume_metadata->volume_label.reset( | 149 volume_metadata->volume_label.reset( |
147 new std::string(volume_info.volume_label)); | 150 new std::string(volume_info.volume_label)); |
148 | 151 |
149 switch (volume_info.type) { | 152 switch (volume_info.type) { |
150 case VOLUME_TYPE_GOOGLE_DRIVE: | 153 case VOLUME_TYPE_GOOGLE_DRIVE: |
151 volume_metadata->volume_type = | 154 volume_metadata->volume_type = |
152 file_browser_private::VOLUME_TYPE_DRIVE; | 155 file_browser_private::VOLUME_TYPE_DRIVE; |
153 break; | 156 break; |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 | 291 |
289 drive::EventLogger* GetLogger(Profile* profile) { | 292 drive::EventLogger* GetLogger(Profile* profile) { |
290 drive::DriveIntegrationService* service = | 293 drive::DriveIntegrationService* service = |
291 drive::DriveIntegrationServiceFactory::FindForProfileRegardlessOfStates( | 294 drive::DriveIntegrationServiceFactory::FindForProfileRegardlessOfStates( |
292 profile); | 295 profile); |
293 return service ? service->event_logger() : NULL; | 296 return service ? service->event_logger() : NULL; |
294 } | 297 } |
295 | 298 |
296 } // namespace util | 299 } // namespace util |
297 } // namespace file_manager | 300 } // namespace file_manager |
OLD | NEW |