components/storage_monitor/portable_device_watcher_win.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: components/storage_monitor/portable_device_watcher_win.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 | « components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc ('k') | components/storage_monitor/storage_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/storage_monitor/portable_device_watcher_win.cc

diff --git a/components/storage_monitor/portable_device_watcher_win.cc b/components/storage_monitor/portable_device_watcher_win.cc

index 571bdaf89f78e77c435f7abf1ef6de07b67809fd..003553eb63d1897c7b3b7883e3d194acf7ec33a5 100644

--- a/components/storage_monitor/portable_device_watcher_win.cc

+++ b/components/storage_monitor/portable_device_watcher_win.cc

@@ -632,11 +632,11 @@ void PortableDeviceWatcherWin::OnDidHandleDeviceAttachEvent(

return;

// Device can have several data partitions. Therefore, add the

- // partition identifier to the storage name. E.g.: "Nexus 7 (s10001)"

- base::string16 storage_name(name + L" (" +

+ // partition identifier to the model name. E.g.: "Nexus 7 (s10001)"

+ base::string16 model_name(name + L" (" +

storage_iter->object_temporary_id + L')');

- StorageInfo info(storage_id, storage_name, location,

- storage_name, base::string16(), base::string16(), 0);

+ StorageInfo info(storage_id, location, base::string16(), base::string16(),

+ model_name, 0);

storage_map_[storage_id] = info;

if (storage_notifications_) {

info.set_location(GetStoragePathFromStorageId(storage_id));