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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/private_api_util.cc

Issue 2580303002: mediaview: Mount ARC documents provider file system volumes. (Closed)
Patch Set: Consistently use GetGlobalService(). Created 3 years, 11 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
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 break; 235 break;
236 case VOLUME_TYPE_MOUNTED_ARCHIVE_FILE: 236 case VOLUME_TYPE_MOUNTED_ARCHIVE_FILE:
237 volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_ARCHIVE; 237 volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_ARCHIVE;
238 break; 238 break;
239 case VOLUME_TYPE_PROVIDED: 239 case VOLUME_TYPE_PROVIDED:
240 volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_PROVIDED; 240 volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_PROVIDED;
241 break; 241 break;
242 case VOLUME_TYPE_MTP: 242 case VOLUME_TYPE_MTP:
243 volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_MTP; 243 volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_MTP;
244 break; 244 break;
245 case VOLUME_TYPE_MEDIA_VIEW:
246 volume_metadata->volume_type =
247 file_manager_private::VOLUME_TYPE_MEDIA_VIEW;
248 break;
245 case VOLUME_TYPE_TESTING: 249 case VOLUME_TYPE_TESTING:
246 volume_metadata->volume_type = 250 volume_metadata->volume_type =
247 file_manager_private::VOLUME_TYPE_TESTING; 251 file_manager_private::VOLUME_TYPE_TESTING;
248 break; 252 break;
249 case NUM_VOLUME_TYPE: 253 case NUM_VOLUME_TYPE:
250 NOTREACHED(); 254 NOTREACHED();
251 break; 255 break;
252 } 256 }
253 257
254 // Fill device_type iff the volume is removable partition. 258 // Fill device_type iff the volume is removable partition.
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 } 374 }
371 375
372 drive::EventLogger* GetLogger(Profile* profile) { 376 drive::EventLogger* GetLogger(Profile* profile) {
373 drive::DriveIntegrationService* service = 377 drive::DriveIntegrationService* service =
374 drive::DriveIntegrationServiceFactory::FindForProfile(profile); 378 drive::DriveIntegrationServiceFactory::FindForProfile(profile);
375 return service ? service->event_logger() : NULL; 379 return service ? service->event_logger() : NULL;
376 } 380 }
377 381
378 } // namespace util 382 } // namespace util
379 } // namespace file_manager 383 } // namespace file_manager
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/fileapi/arc_media_view_util.cc ('k') | chrome/browser/chromeos/file_manager/volume_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698