components/storage_monitor/storage_monitor_mac.mm - 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/storage_monitor_mac.mm

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/storage_monitor_linux_unittest.cc ('k') | components/storage_monitor/storage_monitor_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/storage_monitor/storage_monitor_mac.mm

diff --git a/components/storage_monitor/storage_monitor_mac.mm b/components/storage_monitor/storage_monitor_mac.mm

index a2ba2e3a1b5ba0a438ff92abeb412a885bea4f7e..d8055dce9fa01ae0d477f659874fadb079ea2ec2 100644

--- a/components/storage_monitor/storage_monitor_mac.mm

+++ b/components/storage_monitor/storage_monitor_mac.mm

@@ -101,8 +101,8 @@ StorageInfo BuildStorageInfo(

if (!unique_id.empty())

device_id = StorageInfo::MakeDeviceId(device_type, unique_id);

- return StorageInfo(device_id, base::string16(), location.value(), label,

- vendor, model, size_in_bytes);

+ return StorageInfo(device_id, location.value(), label, vendor, model,

+ size_in_bytes);

}

void GetDiskInfoAndUpdateOnFileThread(