chrome/browser/extensions/api/system_storage/storage_info_provider.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/system_storage/storage_info_provider.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/system_storage/storage_api_test_util.cc ('k') | chrome/browser/media_galleries/media_file_system_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_storage/storage_info_provider.cc

diff --git a/chrome/browser/extensions/api/system_storage/storage_info_provider.cc b/chrome/browser/extensions/api/system_storage/storage_info_provider.cc

index 9057c50a383e71390b6c36c23841ac66dc088032..1869ced0b7e58aaeabf417d591ffa0906b09a753 100644

--- a/chrome/browser/extensions/api/system_storage/storage_info_provider.cc

+++ b/chrome/browser/extensions/api/system_storage/storage_info_provider.cc

@@ -28,7 +28,7 @@ void BuildStorageUnitInfo(const StorageInfo& info,

StorageUnitInfo* unit) {

unit->id = StorageMonitor::GetInstance()->GetTransientIdForDeviceId(

info.device_id());

- unit->name = base::UTF16ToUTF8(info.name());

+ unit->name = base::UTF16ToUTF8(info.GetDisplayName(false));

// TODO(hmin): Might need to take MTP device into consideration.

unit->type = StorageInfo::IsRemovableDevice(info.device_id()) ?

STORAGE_UNIT_TYPE_REMOVABLE : STORAGE_UNIT_TYPE_FIXED;