Picasa import: MediaFileSystemRegistry and misc. plumbing

chrome/browser/media_galleries/media_file_system_registry.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "chrome/browser/media_galleries/media_file_system_context.h"
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
 #include "chrome/browser/media_galleries/scoped_mtp_device_map_entry.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 294 matching lines @@
 
       base::FilePath path = gallery_info.AbsolutePath();
       if (!MediaStorageUtil::CanCreateFileSystem(device_id, path))
         continue;
 
       std::string fsid;
       if (StorageInfo::IsMassStorageDevice(device_id)) {
         fsid = file_system_context_->RegisterFileSystemForMassStorage(
             device_id, path);
       } else {
-        scoped_refptr<ScopedMTPDeviceMapEntry> mtp_device_host;
-        fsid = file_system_context_->RegisterFileSystemForMTPDevice(
-            device_id, path, &mtp_device_host);
-        DCHECK(mtp_device_host.get());
-        media_device_map_references_[pref_id] = mtp_device_host;
+        StorageInfo::Type type;
+        if (!StorageInfo::CrackDeviceId(device_id, &type, NULL))
+          continue;
+
+        switch (type) {

[vandebo (ex-Chrome), 2013/05/22 15:05:49]

I'd prefer to do this switch in
MediaFileSystemContext::RegisterFileSystemForMassStorage

[tommycli, 2013/05/22 18:03:09]

Done.

+          case StorageInfo::MTP_OR_PTP:
+          case StorageInfo::MAC_IMAGE_CAPTURE: {
+            scoped_refptr<ScopedMTPDeviceMapEntry> mtp_device_host;
+            fsid = file_system_context_->RegisterFileSystemForMTPDevice(
+                device_id, path, &mtp_device_host);
+            DCHECK(mtp_device_host.get());
+            media_device_map_references_[pref_id] = mtp_device_host;
+            break;
+          }
+          case StorageInfo::ITUNES: {
+            NOTIMPLEMENTED();
+            break;
+          }
+          case StorageInfo::PICASA: {
+            fsid = file_system_context_->RegisterFileSystemForPicasa(
+                device_id, path);
+            break;
+          }
+          default: {
+            NOTREACHED();
+          }
+        }
       }
       DCHECK(!fsid.empty());
 
       MediaFileSystemInfo new_entry(
           MediaGalleriesDialogController::GetGalleryDisplayNameNoAttachment(
               gallery_info),
           path,
           fsid,
           pref_id,
           GetTransientIdForRemovableDeviceId(device_id),
@@ skipping 246 matching lines @@
     std::string fs_name(extension_misc::kMediaFileSystemPathPart);
     const std::string fsid =
         IsolatedContext::GetInstance()->RegisterFileSystemForPath(
             fileapi::kFileSystemTypeDeviceMedia, path, &fs_name);
     CHECK(!fsid.empty());
     DCHECK(entry);
     *entry = registry_->GetOrCreateScopedMTPDeviceMapEntry(path.value());
     return fsid;
   }
 
+  virtual std::string RegisterFileSystemForPicasa(
+      const std::string& device_id, const base::FilePath& path) OVERRIDE {
+    return
+        ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread(path);
+  }
+
   virtual void RevokeFileSystem(const std::string& fsid) OVERRIDE {
     IsolatedContext::GetInstance()->RevokeFileSystem(fsid);
   }
 
   virtual MediaFileSystemRegistry* GetMediaFileSystemRegistry() OVERRIDE {
     return registry_;
   }
 
  private:
+

[vandebo (ex-Chrome), 2013/05/22 15:05:49]

nit: extra line.

[tommycli, 2013/05/22 18:03:09]

Done.

   MediaFileSystemRegistry* registry_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemContextImpl);
 };
 
 MediaFileSystemRegistry::MediaFileSystemRegistry()
     : file_system_context_(new MediaFileSystemContextImpl(this)) {
   // StorageMonitor may be NULL in unit tests.
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   if (monitor)
@@ skipping 97 matching lines @@
     // previously used.
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome