Clean up media gallery preferences.

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 47 matching lines @@
 
   // The root of the gallery, relative to the root of the device.
   FilePath path;
 
   // The type of gallery.
   Type type;
 };
 
 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:
 
   explicit MediaGalleriesPreferences(Profile* profile);
   virtual ~MediaGalleriesPreferences();
 
   // Builds |remembered_galleries_| from the persistent store.
   void InitFromPrefs();
 
   // Lookup a media gallery and fill in information about it and return true.
   // If the media gallery does not already exist, fill in as much of the
   // MediaGalleryPrefInfo struct as we can and return false.
   // TODO(vandebo) figure out if we want this to be async, in which case:
   // void LookUpGalleryByPath(FilePath&path, callback(const MediaGalleryInfo&))
   bool LookUpGalleryByPath(const FilePath& path,
                            MediaGalleryPrefInfo* gallery) const;
 
+  MediaGalleryPrefIdSet LookUpGalleriesByDeviceId(
+      const std::string& device_id) const;
+
   // Teaches the registry about a new gallery.
   MediaGalleryPrefId AddGallery(const std::string& device_id,
                                 const string16& display_name,
                                 const FilePath& path,
                                 bool user_added);
 
   // Deprecated: Teach the registry about a user added registry simply from
   // the path.
   // TODO(vandebo) remove once webui/options doesn't use this anymore.
   MediaGalleryPrefId AddGalleryByPath(const FilePath& path);
 
   // Removes the gallery identified by |id| from the store.
   void ForgetGalleryById(MediaGalleryPrefId id);
 
-  std::set<MediaGalleryPrefId> GalleriesForExtension(
+  MediaGalleryPrefIdSet GalleriesForExtension(

[Evan Stade, 2012/08/11 00:07:14]

you should update the controller to use this new type.

[vandebo (ex-Chrome), 2012/08/11 00:45:34]

Done.

       const extensions::Extension& extension) const;
 
   void SetGalleryPermissionForExtension(const extensions::Extension& extension,
                                         MediaGalleryPrefId pref_id,
                                         bool has_permission);
 
   const MediaGalleriesPrefInfoMap& known_galleries() const {
     return known_galleries_;
   }
 
   // ProfileKeyedService implementation:
   virtual void Shutdown() OVERRIDE;
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns true if the media gallery UI is turned on.
   static bool UserInteractionIsEnabled();
 
  protected:
   // For testing.
   static string16 ComputeDisplayName(const FilePath& path);
 
  private:
+  typedef std::map<std::string /*device id*/, MediaGalleryPrefIdSet>

[Evan Stade, 2012/08/11 00:07:14]

spaces inside *

[vandebo (ex-Chrome), 2012/08/11 00:45:34]

Actually, I tried changing this, but it looked funny.

I think putting the comment inline makes it easier to read than putting a
comment above it.  So unless you object, I'd rather leave this as is.

+      DeviceIdPrefIdsMap;
+
   // The profile that owns |this|.
   Profile* profile_;
 
   // An in-memory cache of known galleries.
   MediaGalleriesPrefInfoMap known_galleries_;
+  DeviceIdPrefIdsMap device_map_;

[Evan Stade, 2012/08/11 00:07:14]

docs

[vandebo (ex-Chrome), 2012/08/11 00:45:34]

Done.

 
   extensions::ExtensionPrefs* GetExtensionPrefs() const;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferences);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_PREFERENCES_H_