chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.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_private/media_galleries_private_event_router.cc

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

Patch Set: fix unittest build error on mac/linux/chromeos Created 6 years, 9 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

« no previous file with comments | « chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc ('k') | chrome/browser/extensions/api/system_storage/storage_api_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc

diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc

index 7a86a39deea82cb56c1b16eb8df944c246bef356..13d8ac52e41531344869d007d837144732e4b607 100644

--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc

+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc

@@ -92,18 +92,8 @@ void MediaGalleriesPrivateEventRouter::OnRemovableStorageAttached(

media_galleries_private::OnDeviceAttached::kEventName))

return;

- MediaGalleryPrefInfo pref_info;

- pref_info.display_name = info.name();

- pref_info.device_id = info.device_id();

- pref_info.type = MediaGalleryPrefInfo::kAutoDetected;

- pref_info.volume_label = info.storage_label();

- pref_info.vendor_name = info.vendor_name();

- pref_info.model_name = info.model_name();

- pref_info.total_size_in_bytes = info.total_size_in_bytes();

- pref_info.volume_metadata_valid = true;

DeviceAttachmentDetails details;

- details.device_name = base::UTF16ToUTF8(pref_info.GetGalleryDisplayName());

+ details.device_name = base::UTF16ToUTF8(info.GetDisplayName(true));

details.device_id = GetTransientIdForDeviceId(info.device_id());

scoped_ptr<base::ListValue> args(new base::ListValue());