chrome/browser/storage_monitor/storage_monitor_linux.cc - 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_linux.cc

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

Patch Set: another chromeos fix 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

« chrome/browser/storage_monitor/media_storage_util_unittest.cc ('K') | « chrome/browser/storage_monitor/storage_monitor_chromeos.cc ('k') | chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/storage_monitor_linux.cc

diff --git a/chrome/browser/storage_monitor/storage_monitor_linux.cc b/chrome/browser/storage_monitor/storage_monitor_linux.cc

index 6c98767a6421dd8727818e8cd823bc7d79d82203..2f453a83471b8cb359f4b39b74623d18a7a5cb82 100644

--- a/chrome/browser/storage_monitor/storage_monitor_linux.cc

+++ b/chrome/browser/storage_monitor/storage_monitor_linux.cc

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

#include "base/string_util.h"

#include "base/strings/string_number_conversions.h"

#include "base/utf_string_conversions.h"

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

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

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

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

@@ -146,7 +145,7 @@ string16 GetDeviceName(struct udev_device* device) {

"RemovableDeviceNotificationsLinux.device_file_system_uuid_available",

!device_label.empty());

- const string16 name = GetFullProductName(

+ const string16 name = MediaStorageUtil::GetFullProductName(

GetUdevDevicePropertyValue(device, kVendor),

GetUdevDevicePropertyValue(device, kModel));

@@ -428,7 +427,7 @@ void StorageMonitorLinux::AddNewMount(const base::FilePath& mount_device,

if (unique_id.empty() || name.empty())

return;

- bool has_dcim = IsMediaDevice(mount_point.value());

+ bool has_dcim = MediaStorageUtil::HasDcim(mount_point.value());

MediaStorageUtil::Type type;

if (removable) {

if (has_dcim) {

@@ -451,9 +450,11 @@ void StorageMonitorLinux::AddNewMount(const base::FilePath& mount_device,

mount_priority_map_[mount_device][mount_point] = removable;

if (removable) {

- receiver()->ProcessAttach(StorageInfo(

- device_id, GetDisplayNameForDevice(partition_size_in_bytes, name),

- mount_point.value()));

+ string16 display_name = MediaStorageUtil::GetDisplayNameForDevice(

+ partition_size_in_bytes, name);

+ StorageInfo storage_info(device_id, display_name, mount_point.value());

Greg Billock 2013/03/06 21:48:27 I'd get rid of this temporary here and elsewhere.

+ receiver()->ProcessAttach(storage_info);

}