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

chrome/browser/media_gallery/media_galleries_preferences.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.
 
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 180 matching lines @@
 
       MediaGalleryPrefInfo gallery_info;
       if (!PopulateGalleryPrefInfoFromDictionary(*dict, &gallery_info))
         continue;
 
       known_galleries_[gallery_info.pref_id] = gallery_info;
       device_map_[gallery_info.device_id].insert(gallery_info.pref_id);
     }
   }
   if (notify_observers)
-    NotifyChangeObservers();
+    NotifyChangeObservers("");
 }
 
-void MediaGalleriesPreferences::NotifyChangeObservers() {
+void MediaGalleriesPreferences::NotifyChangeObservers(
+    const std::string& extension_id) {
   FOR_EACH_OBSERVER(GalleryChangeObserver,
                     gallery_change_observers_,
-                    OnGalleryChanged(this));
+                    OnGalleryChanged(this, extension_id));
 }
 
 void MediaGalleriesPreferences::AddGalleryChangeObserver(
     GalleryChangeObserver* observer) {
   gallery_change_observers_.AddObserver(observer);
 }
 
 void MediaGalleriesPreferences::RemoveGalleryChangeObserver(
     GalleryChangeObserver* observer) {
   gallery_change_observers_.RemoveObserver(observer);
@@ skipping 214 matching lines @@
     return;
 
 #if defined(ENABLE_EXTENSIONS)
   extensions::GalleryWatchStateTracker* state_tracker =
       extensions::GalleryWatchStateTracker::GetForProfile(profile_);
 #endif
   bool all_permission = HasAutoDetectedGalleryPermission(extension);
   if (has_permission && all_permission) {
     if (gallery_info->second.type == MediaGalleryPrefInfo::kAutoDetected) {
       GetExtensionPrefs()->UnsetMediaGalleryPermission(extension.id(), pref_id);
+      NotifyChangeObservers(extension.id());
 #if defined(ENABLE_EXTENSIONS)
       if (state_tracker) {
         state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id,
                                                   true);
       }
 #endif
       return;
     }
   }
 
   if (!has_permission && !all_permission) {
     GetExtensionPrefs()->UnsetMediaGalleryPermission(extension.id(), pref_id);
   } else {
     GetExtensionPrefs()->SetMediaGalleryPermission(extension.id(), pref_id,
                                                    has_permission);
   }
+  NotifyChangeObservers(extension.id());
 #if defined(ENABLE_EXTENSIONS)
   if (state_tracker) {
     state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id,
                                               has_permission);
   }
 #endif
 }
 
 void MediaGalleriesPreferences::Shutdown() {
   profile_ = NULL;
@@ skipping 16 matching lines @@
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 }  // namespace chrome