chrome/browser/extensions/api/media_galleries/media_galleries_api.cc - Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo.

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/extensions/api/media_galleries/media_galleries_api.cc

Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update Created 7 years 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

« no previous file with comments | « no previous file | chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc » ('j') | chrome/browser/storage_monitor/media_storage_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

index 28c259ec05c34e28a2c988cc2f93f39d89234001..4fc733e84a5e54d551f77c8f20a95aba8790c84b 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -311,7 +311,9 @@ void MediaGalleriesGetAllMediaFileSystemMetadataFunction::OnGetGalleries(

DCHECK(gallery_it != galleries.end());

const MediaGalleryPrefInfo& gallery = gallery_it->second;

MediaGalleries::MediaFileSystemMetadata metadata;

- metadata.name = base::UTF16ToUTF8(gallery.GetGalleryDisplayName());

+ metadata.name = base::UTF16ToUTF8(

+ MediaStorageUtil::GetGalleryDisplayNameFromPath(

+ gallery.AbsolutePath()));

metadata.gallery_id = base::Uint64ToString(gallery.pref_id);

metadata.is_removable = StorageInfo::IsRemovableDevice(gallery.device_id);

metadata.is_media_device = StorageInfo::IsMediaDevice(gallery.device_id);