Media Galleries: Add MediaGalleriesPreferences::GalleryChangeObserver class.

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 118 matching lines @@
     : pref_id(kInvalidMediaGalleryPrefId),
       type(kInvalidType) {
 }
 MediaGalleryPrefInfo::~MediaGalleryPrefInfo() {}
 
 FilePath MediaGalleryPrefInfo::AbsolutePath() const {
   FilePath base_path = MediaStorageUtil::FindDevicePathById(device_id);
   return base_path.Append(path);
 }
 
+MediaGalleriesPreferences::GalleryChangeObserver::~GalleryChangeObserver() {}
+
 MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile)
     : profile_(profile) {
   AddDefaultGalleriesIfFreshProfile();
-  InitFromPrefs();
+  InitFromPrefs(false /*no notification*/);
 }
 
 MediaGalleriesPreferences::~MediaGalleriesPreferences() {}
 
 void MediaGalleriesPreferences::AddDefaultGalleriesIfFreshProfile() {
   // Only add defaults the first time.
   if (APIHasBeenUsed(profile_))
     return;
 
   // Fresh profile case.
@@ skipping 11 matching lines @@
     std::string device_id;
     string16 display_name;
     FilePath relative_path;
     if (MediaStorageUtil::GetDeviceInfoFromPath(path, &device_id, &display_name,
                                                 &relative_path)) {
       AddGallery(device_id, display_name, relative_path, false /*user added*/);
     }
   }
 }
 
-void MediaGalleriesPreferences::InitFromPrefs() {
+void MediaGalleriesPreferences::InitFromPrefs(bool notify_observers) {
   known_galleries_.clear();
   device_map_.clear();
 
   PrefService* prefs = profile_->GetPrefs();
   const ListValue* list = prefs->GetList(
       prefs::kMediaGalleriesRememberedGalleries);
-  if (!list)
+  if (!list) {

[vandebo (ex-Chrome), 2013/01/31 01:27:56]

To remove the code duplication, what do you think about putting the for loop in
an if (list) block and removing the early exit?

[Lei Zhang, 2013/01/31 01:34:35]

Done.

+    if (notify_observers)
+      NotifyChangeObservers();
     return;
+  }
 
   for (ListValue::const_iterator it = list->begin(); it != list->end(); ++it) {
     const DictionaryValue* dict = NULL;
     if (!(*it)->GetAsDictionary(&dict))
       continue;
 
     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();
+}
+
+void MediaGalleriesPreferences::NotifyChangeObservers() {
+  FOR_EACH_OBSERVER(GalleryChangeObserver,
+                    gallery_change_observers_,
+                    OnGalleryChanged(this));
+}
+
+void MediaGalleriesPreferences::AddGalleryChangeObserver(
+    GalleryChangeObserver* observer) {
+  gallery_change_observers_.AddObserver(observer);
+}
+
+void MediaGalleriesPreferences::RemoveGalleryChangeObserver(
+    GalleryChangeObserver* observer) {
+  gallery_change_observers_.RemoveObserver(observer);
 }
 
 bool MediaGalleriesPreferences::LookUpGalleryByPath(
     const FilePath& path,
     MediaGalleryPrefInfo* gallery_info) const {
   std::string device_id;
   string16 device_name;
   FilePath relative_path;
   if (!MediaStorageUtil::GetDeviceInfoFromPath(path, &device_id, &device_name,
                                                &relative_path)) {
@@ skipping 68 matching lines @@
         MediaGalleryPrefId iter_id;
         if ((*list_iter)->GetAsDictionary(&dict) &&
             GetPrefId(*dict, &iter_id) &&
             *it == iter_id) {
           if (update_gallery_type) {
             dict->SetString(kMediaGalleriesTypeKey,
                             kMediaGalleriesTypeAutoDetectedValue);
           }
           if (update_gallery_name)
             dict->SetString(kMediaGalleriesDisplayNameKey, display_name);
-          InitFromPrefs();
+          InitFromPrefs(true /* notify observers */);
           break;
         }
       }
     }
     return *it;
   }
 
   PrefService* prefs = profile_->GetPrefs();
 
   MediaGalleryPrefInfo gallery_info;
   gallery_info.pref_id = prefs->GetUint64(prefs::kMediaGalleriesUniqueId);
   prefs->SetUint64(prefs::kMediaGalleriesUniqueId, gallery_info.pref_id + 1);
   gallery_info.display_name = display_name;
   gallery_info.device_id = device_id;
   gallery_info.path = normalized_relative_path;
   gallery_info.type = MediaGalleryPrefInfo::kAutoDetected;
   if (user_added)
     gallery_info.type = MediaGalleryPrefInfo::kUserAdded;
 
   ListPrefUpdate update(prefs, prefs::kMediaGalleriesRememberedGalleries);
   ListValue* list = update.Get();
   list->Append(CreateGalleryPrefInfoDictionary(gallery_info));
-  InitFromPrefs();
+  InitFromPrefs(true /* notify observers */);
 
   return gallery_info.pref_id;
 }
 
 MediaGalleryPrefId MediaGalleriesPreferences::AddGalleryByPath(
     const FilePath& path) {
   MediaGalleryPrefInfo gallery_info;
   if (LookUpGalleryByPath(path, &gallery_info) &&
       gallery_info.type != MediaGalleryPrefInfo::kBlackListed) {
     return gallery_info.pref_id;
@@ skipping 17 matching lines @@
         pref_id == iter_id) {
       GetExtensionPrefs()->RemoveMediaGalleryPermissions(pref_id);
       MediaGalleryPrefInfo::Type type;
       if (GetType(*dict, &type) &&
           type == MediaGalleryPrefInfo::kAutoDetected) {
         dict->SetString(kMediaGalleriesTypeKey,
                         kMediaGalleriesTypeBlackListedValue);
       } else {
         list->Erase(iter, NULL);
       }
-      InitFromPrefs();
+      InitFromPrefs(true /* notify observers */);
       return;
     }
   }
 }
 
 MediaGalleryPrefIdSet MediaGalleriesPreferences::GalleriesForExtension(
     const extensions::Extension& extension) const {
   MediaGalleryPrefIdSet result;
 
   if (HasAutoDetectedGalleryPermission(extension)) {
@@ skipping 73 matching lines @@
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 }  // namespace chrome