chrome/browser/media_galleries/media_galleries_permission_controller.cc - Issue 329643002: Media Galleries: Allow readding blacklisted iApps libraries.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 329643002: Media Galleries: Allow readding blacklisted iApps libraries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« chrome/browser/media_galleries/fileapi/iapps_finder_impl.cc ('K') | « chrome/browser/media_galleries/fileapi/iapps_finder_impl.cc ('k') | chrome/browser/media_galleries/media_galleries_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_permission_controller.cc

diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.cc b/chrome/browser/media_galleries/media_galleries_permission_controller.cc

index 77b1148ed0d933a1fd62fd64c1082db679d79adf..87c54405f5f403bd147855b657bcdba8de7d437f 100644

--- a/chrome/browser/media_galleries/media_galleries_permission_controller.cc

+++ b/chrome/browser/media_galleries/media_galleries_permission_controller.cc

@@ -321,8 +321,9 @@ void MediaGalleriesPermissionController::FileSelected(

}

// Lastly, if not found, add a new gallery to |new_galleries_|.

- DCHECK_EQ(kInvalidMediaGalleryPrefId, gallery.pref_id);

- gallery.pref_id = GetDialogId(kInvalidMediaGalleryPrefId);

+ // prefId == kInvalidMediaGalleryPrefId for completely new galleries.

+ // The old prefId is retained for blacklisted galleries.

+ gallery.pref_id = GetDialogId(gallery.pref_id);

vandebo (ex-Chrome) 2014/06/10 21:57:17 I think this fixes a bug I just introduced... Can

tommycli 2014/06/10 23:59:06 Done.

new_galleries_[gallery.pref_id] = Entry(gallery, true);

dialog_->UpdateGalleries();

}