[Media Gallery] Add existing attached devices to the prefs in time for media galleries dialog.

chrome/browser/media_gallery/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_gallery/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 464 matching lines @@
 void MediaFileSystemRegistry::GetMediaFileSystemsForExtension(
     const content::RenderViewHost* rvh,
     const extensions::Extension* extension,
     const MediaFileSystemsCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   Profile* profile =
       Profile::FromBrowserContext(rvh->GetProcess()->GetBrowserContext());
   MediaGalleriesPreferences* preferences =
       MediaGalleriesPreferencesFactory::GetForProfile(profile);
-
-  if (!ContainsKey(extension_hosts_map_, profile))
-    AddAttachedMediaDeviceGalleries(preferences);

[vandebo (ex-Chrome), 2012/10/27 19:57:57]

Maybe we should still call the new function here?

[kmadhusu, 2012/10/28 01:13:43]

I don't think this call is required here.  This function is called from
MediaGalleriesGetMediaFileSystemsFunction.  If we are going to call
AddAttachedMediaDeviceGalleries from
MediaGalleriesGetMediaFileSystemsFunction::RunImpl, this call is not required
here.  Please correct me if I am wrong.

   MediaGalleryPrefIdSet galleries =
       preferences->GalleriesForExtension(*extension);
 
   // If the extension has no galleries and it didn't have any last time, just
   // return the empty list. The second check is needed because of
   // http://crbug.com/145855.
   bool has_extension_host = ContainsKey(extension_hosts_map_, profile) &&
       ContainsKey(extension_hosts_map_[profile], extension->id());
   if (galleries.empty() && !has_extension_host) {
     callback.Run(std::vector<MediaFileSystemInfo>());
@@ skipping 73 matching lines @@
       for (std::set<MediaGalleryPrefId>::const_iterator pref_id_it =
                invalid_galleries_info[i].pref_ids.begin();
            pref_id_it != invalid_galleries_info[i].pref_ids.end();
            ++pref_id_it) {
         (*extension_host_it)->RevokeGalleryByPrefId(*pref_id_it);
       }
     }
   }
 }
 
+void MediaFileSystemRegistry::AddAttachedMediaDeviceGalleries(
+    const content::RenderViewHost* rvh) {
+  Profile* profile =
+    Profile::FromBrowserContext(rvh->GetProcess()->GetBrowserContext());
+  if (ContainsKey(extension_hosts_map_, profile))
+    return;  // Devices already enumerated.
+
+  // SystemMonitor may be NULL in unit tests.
+  SystemMonitor* system_monitor = SystemMonitor::Get();
+  if (!system_monitor)
+    return;
+
+  std::vector<SystemMonitor::RemovableStorageInfo> existing_devices =
+      system_monitor->GetAttachedRemovableStorage();
+  MediaGalleriesPreferences* preferences =
+      MediaGalleriesPreferencesFactory::GetForProfile(profile);
+  DCHECK(preferences);
+  for (size_t i = 0; i < existing_devices.size(); i++) {
+    if (!MediaStorageUtil::IsMediaDevice(existing_devices[i].device_id))
+      continue;
+    preferences->AddGallery(existing_devices[i].device_id,
+                            existing_devices[i].name, FilePath(),
+                            false /*not user added*/);
+  }
+}
+
 /******************
  * Private methods
  ******************/
 
 class MediaFileSystemRegistry::MediaFileSystemContextImpl
     : public MediaFileSystemContext {
  public:
   explicit MediaFileSystemContextImpl(MediaFileSystemRegistry* registry)
       : registry_(registry) {
     DCHECK(registry_);  // Suppresses unused warning on Android.
@@ skipping 80 matching lines @@
 
 void MediaFileSystemRegistry::RemoveScopedMtpDeviceMapEntry(
     const FilePath::StringType& device_location) {
   MTPDeviceDelegateMap::iterator delegate_it =
       mtp_delegate_map_.find(device_location);
   DCHECK(delegate_it != mtp_delegate_map_.end());
   mtp_delegate_map_.erase(delegate_it);
 }
 #endif
 
-void MediaFileSystemRegistry::AddAttachedMediaDeviceGalleries(
-    MediaGalleriesPreferences* preferences) {
-  // SystemMonitor may be NULL in unit tests.
-  SystemMonitor* system_monitor = SystemMonitor::Get();
-  if (!system_monitor)
-    return;
-
-  std::vector<SystemMonitor::RemovableStorageInfo> existing_devices =
-      system_monitor->GetAttachedRemovableStorage();
-  for (size_t i = 0; i < existing_devices.size(); i++) {
-    if (!MediaStorageUtil::IsMediaDevice(existing_devices[i].device_id))
-      continue;
-    preferences->AddGallery(existing_devices[i].device_id,
-                            existing_devices[i].name, FilePath(),
-                            false /*not user added*/);
-  }
-}
-
 void MediaFileSystemRegistry::OnExtensionGalleriesHostEmpty(
     Profile* profile, const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ExtensionGalleriesHostMap::iterator extension_hosts =
       extension_hosts_map_.find(profile);
   DCHECK(extension_hosts != extension_hosts_map_.end());
   ExtensionHostMap::size_type erase_count =
       extension_hosts->second.erase(extension_id);
   DCHECK_EQ(1U, erase_count);
   if (extension_hosts->second.empty())
     extension_hosts_map_.erase(extension_hosts);
 }
 
 }  // namespace chrome