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: 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 | « chrome/browser/extensions/api/media_galleries/media_galleries_api.cc ('k') | chrome/browser/media_galleries/media_file_system_registry.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_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 b924116e89d9d26628fc5d4fdcc602e3fff31bc6..7f98e2b424af4b97f670994749c12a7b7c2e1406 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

@@ -13,6 +13,7 @@

#include "chrome/browser/extensions/event_names.h"

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/storage_monitor/media_storage_util.h"

#include "chrome/browser/storage_monitor/storage_monitor.h"

#include "chrome/common/extensions/api/media_galleries_private.h"

#include "content/public/browser/browser_thread.h"

@@ -101,7 +102,9 @@ void MediaGalleriesPrivateEventRouter::OnRemovableStorageAttached(

pref_info.volume_metadata_valid = true;

DeviceAttachmentDetails details;

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

+ details.device_name = UTF16ToUTF8(

+ MediaStorageUtil::GetGalleryDisplayNameFromPath(

+ pref_info.AbsolutePath()));

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

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