chrome/browser/storage_monitor/storage_monitor_mac.mm - Issue 12544005: Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

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

Issue 12544005: Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mac apply patch Created 7 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/storage_monitor/storage_monitor_linux_unittest.cc ('k') | chrome/browser/storage_monitor/volume_mount_watcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/storage_monitor_mac.mm

diff --git a/chrome/browser/storage_monitor/storage_monitor_mac.mm b/chrome/browser/storage_monitor/storage_monitor_mac.mm

index 3d691881d41f428b8b4bc6ea5914b1d6b772c816..afbb9934852ea1d6e331028a7a15314abdb2b678 100644

--- a/chrome/browser/storage_monitor/storage_monitor_mac.mm

+++ b/chrome/browser/storage_monitor/storage_monitor_mac.mm

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

#include "base/mac/mac_util.h"

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

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

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

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

namespace chrome {

@@ -153,7 +153,7 @@ void StorageMonitorMac::UpdateDisk(const DiskInfoMac& info,

MediaStorageUtil::RecordDeviceInfoHistogram(true, info.device_id(),

info.device_name());

if (ShouldPostNotificationForDisk(info)) {

- string16 display_name = GetDisplayNameForDevice(

+ string16 display_name = MediaStorageUtil::GetDisplayNameForDevice(

info.total_size_in_bytes(), info.device_name());

receiver()->ProcessAttach(StorageInfo(

info.device_id(), display_name, info.mount_point().value()));