Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1698)

Unified Diff: chrome/browser/media_galleries/media_galleries_permission_controller.h

Issue 321443003: Change the media galleries permission dialog to have a suggestions section. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update test Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media_galleries/media_galleries_permission_controller.h
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.h b/chrome/browser/media_galleries/media_galleries_permission_controller.h
index f71a5473f105c38f78c94b32fc34d2d67e178d42..a1163a6464075fb77416dbfac313ff6a2022de29 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller.h
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.h
@@ -91,13 +91,14 @@ class MediaGalleriesPermissionController
private:
// This type keeps track of media galleries already known to the prefs system.
typedef std::map<GalleryDialogId, Entry> GalleryPermissionsMap;
+ typedef std::map<GalleryDialogId, bool /*permitted*/> ToggledGalleryMap;
class DialogIdMap {
public:
DialogIdMap();
~DialogIdMap();
GalleryDialogId GetDialogId(MediaGalleryPrefId pref_id);
- MediaGalleryPrefId GetPrefId(GalleryDialogId id);
+ MediaGalleryPrefId GetPrefId(GalleryDialogId id) const;
private:
GalleryDialogId next_dialog_id_;
@@ -165,7 +166,7 @@ class MediaGalleriesPermissionController
void UpdateGalleriesOnDeviceEvent(const std::string& device_id);
GalleryDialogId GetDialogId(MediaGalleryPrefId pref_id);
- MediaGalleryPrefId GetPrefId(GalleryDialogId id);
+ MediaGalleryPrefId GetPrefId(GalleryDialogId id) const;
Profile* GetProfile();
@@ -184,7 +185,10 @@ class MediaGalleriesPermissionController
GalleryPermissionsMap known_galleries_;
// Galleries in |known_galleries_| that the user have toggled.
- std::set<GalleryDialogId> toggled_galleries_;
+ ToggledGalleryMap toggled_galleries_;
+
+ // The current set of permitted galleries (according to prefs).
+ MediaGalleryPrefIdSet pref_permitted_galleries_;
// Map of new galleries the user added, but have not saved. This list should
// never overlap with |known_galleries_|.
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/media_galleries/media_galleries_permission_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698