Put all scan results in the media galleries scan result dialog.

chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.h"
 
 #include <algorithm>
 #include <list>
 
 #include "base/bind.h"
@@ skipping 205 matching lines @@
 void MediaGalleriesScanResultDialogController::UpdateScanResultsFromPreferences(
     MediaGalleriesPreferences* preferences,
     const extensions::Extension* extension,
     MediaGalleryPrefIdSet ignore_list, ScanResults* scan_results) {
   DCHECK(preferences->IsInitialized());
   const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries();
   MediaGalleryPrefIdSet permitted =
       preferences->GalleriesForExtension(*extension);
 
   // Add or update any scan results that the extension doesn't already have
   // access to or isn't in |results_to_remove_|.

[Lei Zhang, 2014/02/14 07:34:02]

nit: |results_to_remove_| -> |ignore_list|

[vandebo (ex-Chrome), 2014/02/14 19:11:55]

Done.

   for (MediaGalleriesPrefInfoMap::const_iterator it = galleries.begin();
        it != galleries.end();
        ++it) {
     const MediaGalleryPrefInfo& gallery = it->second;
-    if (gallery.type == MediaGalleryPrefInfo::kScanResult &&
+    if ((gallery.audio_count || gallery.image_count || gallery.video_count) &&
+        !gallery.IsBlackListedType() &&
         !ContainsKey(permitted, gallery.pref_id) &&
         !ContainsKey(ignore_list, gallery.pref_id)) {
       ScanResults::iterator existing = scan_results->find(gallery.pref_id);
       if (existing == scan_results->end()) {
         // Default to selected.
         (*scan_results)[gallery.pref_id] = ScanResult(gallery, true);
       } else {
         // Update pref_info, in case anything has been updated.
         existing->second.pref_info = gallery;
       }
     }
   }
 
   // Remove anything from |scan_results_| that's no longer valid or the user

[Lei Zhang, 2014/02/14 07:34:02]

nit: |scan_results_| -> |scan_results|

[vandebo (ex-Chrome), 2014/02/14 19:11:55]

Done.

   // already has access to.
   std::list<ScanResults::iterator> to_remove;
   for (ScanResults::iterator it = scan_results->begin();
        it != scan_results->end();
        ++it) {
     MediaGalleriesPrefInfoMap::const_iterator pref_gallery =
         galleries.find(it->first);
     if (pref_gallery == galleries.end() ||
-        pref_gallery->second.type != MediaGalleryPrefInfo::kScanResult ||
-        permitted.find(it->first) != permitted.end()) {
+        pref_gallery->second.IsBlackListedType() ||
+        ContainsKey(permitted, it->first)) {
       to_remove.push_back(it);
     }
   }
   while (!to_remove.empty()) {
     scan_results->erase(to_remove.front());
     to_remove.pop_front();
   }
 }
 
 void MediaGalleriesScanResultDialogController::OnPreferencesInitialized() {
   // These may be NULL in tests.
   if (StorageMonitor::GetInstance())
     StorageMonitor::GetInstance()->AddObserver(this);
   if (preferences_) {
     preferences_->AddGalleryChangeObserver(this);
     UpdateScanResultsFromPreferences(preferences_, extension_,
                                      results_to_remove_, &scan_results_);
   }
 
   // TODO(vandebo): Remove the conditional after GTK is removed.
   if (!create_dialog_callback_.is_null())
     dialog_.reset(create_dialog_callback_.Run(this));
 }
 
 void MediaGalleriesScanResultDialogController::OnPreferenceUpdate(
     const std::string& extension_id, MediaGalleryPrefId pref_id) {

[Lei Zhang, 2014/02/14 07:34:02]

drop |pref_id| since it's no longer used?

[vandebo (ex-Chrome), 2014/02/14 19:11:55]

Done.

   if (extension_id == extension_->id()) {
-    const MediaGalleriesPrefInfoMap::const_iterator it =
-        preferences_->known_galleries().find(pref_id);
-    if (it == preferences_->known_galleries().end() ||
-        it->second.type == MediaGalleryPrefInfo::kScanResult ||
-        it->second.type == MediaGalleryPrefInfo::kRemovedScan) {
-      UpdateScanResultsFromPreferences(preferences_, extension_,
-                                       results_to_remove_, &scan_results_);
-      dialog_->UpdateResults();
-    }
+    UpdateScanResultsFromPreferences(preferences_, extension_,
+                                     results_to_remove_, &scan_results_);
+    dialog_->UpdateResults();
   }
 }
 
 void MediaGalleriesScanResultDialogController::OnRemovableDeviceUpdate(
     const std::string device_id) {
   for (ScanResults::const_iterator it = scan_results_.begin();
        it != scan_results_.end();
        ++it) {
     if (it->second.pref_info.device_id == device_id) {
       dialog_->UpdateResults();
@@ skipping 44 matching lines @@
 
 void MediaGalleriesScanResultDialogController::OnGalleryInfoUpdated(
     MediaGalleriesPreferences* /* prefs */,
     MediaGalleryPrefId pref_id) {
   OnPreferenceUpdate(extension_->id(), pref_id);
 }
 
 // MediaGalleriesScanResultDialog ---------------------------------------------
 
 MediaGalleriesScanResultDialog::~MediaGalleriesScanResultDialog() {}