Media Galleries: Prune uninteresting folders when scanning.

chrome/browser/media_galleries/media_folder_finder.h

Index: chrome/browser/media_galleries/media_folder_finder.h
===================================================================
--- chrome/browser/media_galleries/media_folder_finder.h	(revision 252098)
+++ chrome/browser/media_galleries/media_folder_finder.h	(working copy)
@@ -19,10 +19,17 @@
 // media files.
 class MediaFolderFinder {
  public:
+  // Key: path to a folder
+  // Value: scan results for that folder, non-recursive.
   typedef std::map<base::FilePath, MediaGalleryScanResult>
       MediaFolderFinderResults;
-  typedef base::Callback<void(bool /*success*/,
-                              const MediaFolderFinderResults& /*results*/)>
+
+  // |results| never contains entries for |sensitive_locations| or parent
+  // directories of |sensitive_locations|.
+  typedef base::Callback<
+      void(bool /*success*/,
+           const MediaFolderFinderResults& /*results*/,
+           const std::vector<base::FilePath>& /*sensitive_locations*/)>

[vandebo (ex-Chrome), 2014/02/20 23:00:23]

No reason to make this part of the result callback, just add a method to access
it.

[Lei Zhang, 2014/02/25 01:24:25]

Done.

       MediaFolderFinderResultsCallback;
 
   // |callback| will get called when the scan finishes. If the object is deleted
@@ -67,6 +74,7 @@
   const MediaFolderFinderResultsCallback results_callback_;
   MediaFolderFinderResults results_;
 
+  std::vector<base::FilePath> graylisted_folders_;
   std::vector<base::FilePath> folders_to_scan_;
   ScanState scan_state_;