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

chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_CONTROLLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 86 matching lines @@
 
   virtual content::WebContents* web_contents();
 
   ui::MenuModel* GetContextMenu(MediaGalleryPrefId id);
 
  protected:
   typedef base::Callback<MediaGalleriesScanResultDialog* (
       MediaGalleriesScanResultDialogController*)> CreateDialogCallback;
   typedef std::map<MediaGalleryPrefId, ScanResult> ScanResults;
 
-  // Updates |results| from |preferences|. Will not add galleries from
-  // |ignore_list| onto |results|.
+  // Updates |scan_results| from |preferences|. Will not add galleries from
+  // |ignore_list| onto |scan_results|.
   static void UpdateScanResultsFromPreferences(
       MediaGalleriesPreferences* preferences,
       const extensions::Extension* extension,
       MediaGalleryPrefIdSet ignore_list,
       ScanResults* scan_results);
 
   // Used for unit tests.
   MediaGalleriesScanResultDialogController(
       const extensions::Extension& extension,
       MediaGalleriesPreferences* preferences_,
       const CreateDialogCallback& create_dialog_callback,
       const base::Closure& on_finish);
 
   virtual ~MediaGalleriesScanResultDialogController();
 
  private:
   friend class MediaGalleriesScanResultDialogControllerTest;
   friend class MediaGalleriesScanResultDialogCocoaTest;
 
   // Bottom half of constructor -- called when |preferences_| is initialized.
   void OnPreferencesInitialized();
 
   // Used to keep the dialog in sync with the preferences.
-  void OnPreferenceUpdate(const std::string& extension_id,
-                          MediaGalleryPrefId pref_id);
+  void OnPreferenceUpdate(const std::string& extension_id);
 
   // Used to keep the dialog in sync with attached and detached devices.
   void OnRemovableDeviceUpdate(const std::string device_id);
 
   Profile* GetProfile() const;
 
   // RemovableStorageObserver implementation.
   // Used to keep dialog in sync with removable device status.
   virtual void OnRemovableStorageAttached(const StorageInfo& info) OVERRIDE;
   virtual void OnRemovableStorageDetached(const StorageInfo& info) OVERRIDE;
@@ skipping 40 matching lines @@
 
   // The view that's showing.
   scoped_ptr<MediaGalleriesScanResultDialog> dialog_;
 
   scoped_ptr<MediaGalleryContextMenu> context_menu_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesScanResultDialogController);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_CONTROLLER_H_