Media Galleries: Keep media gallery permission dialogs in sync with the gallery

chrome/browser/media_gallery/media_galleries_preferences.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_PREFERENCES_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_PREFERENCES_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 60 matching lines @@
 typedef std::map<MediaGalleryPrefId, MediaGalleryPrefInfo>
     MediaGalleriesPrefInfoMap;
 typedef std::set<MediaGalleryPrefId> MediaGalleryPrefIdSet;
 
 // A class to manage the media gallery preferences.  There is one instance per
 // user profile.
 class MediaGalleriesPreferences : public ProfileKeyedService {
  public:
   class GalleryChangeObserver {
     public:
-     virtual void OnGalleryChanged(MediaGalleriesPreferences* pref) {}
+     // |extension_id| specifies the extension affected by this change.
+     // It is empty if the gallery change affects all extensions.
+     virtual void OnGalleryChanged(MediaGalleriesPreferences* pref,
+                                   const std::string& extension_id) {}
 
     protected:
      virtual ~GalleryChangeObserver();
   };
 
   explicit MediaGalleriesPreferences(Profile* profile);
   virtual ~MediaGalleriesPreferences();
 
   void AddGalleryChangeObserver(GalleryChangeObserver* observer);
   void RemoveGalleryChangeObserver(GalleryChangeObserver* observer);
@@ skipping 59 matching lines @@
       DeviceIdPrefIdsMap;
 
   // Populates the default galleries if this is a fresh profile.
   void AddDefaultGalleriesIfFreshProfile();
 
   // Builds |known_galleries_| from the persistent store.
   // Notifies GalleryChangeObservers if |notify_observers| is true.
   void InitFromPrefs(bool notify_observers);
 
   // Notifies |gallery_change_observers_| about changes in |known_galleries_|.
-  void NotifyChangeObservers();
+  void NotifyChangeObservers(const std::string& extension_id);
 
   extensions::ExtensionPrefs* GetExtensionPrefs() const;
 
   // The profile that owns |this|.
   Profile* profile_;
 
   // An in-memory cache of known galleries.
   MediaGalleriesPrefInfoMap known_galleries_;
 
   // A mapping from device id to the set of gallery pref ids on that device.
   // All pref ids in |device_map_| are also in |known_galleries_|.
   DeviceIdPrefIdsMap device_map_;
 
   ObserverList<GalleryChangeObserver> gallery_change_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferences);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_PREFERENCES_H_