Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Unified Diff: chrome/browser/system_monitor/removable_device_notifications_linux.cc

Issue 11573048: [Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to head Created 7 years, 12 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
Index: chrome/browser/system_monitor/removable_device_notifications_linux.cc
diff --git a/chrome/browser/system_monitor/removable_device_notifications_linux.cc b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
index ac899feb1a33f9e04f435bd1cbf4963a80736c0a..b57b8ca132db66f08e1de11ec4a175d9891b507a 100644
--- a/chrome/browser/system_monitor/removable_device_notifications_linux.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
@@ -18,7 +18,6 @@
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
-#include "base/system_monitor/system_monitor.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
#include "chrome/browser/system_monitor/media_storage_util.h"
@@ -267,7 +266,7 @@ void RemovableDeviceNotificationsLinux::Init() {
bool RemovableDeviceNotificationsLinux::GetDeviceInfoForPath(
const FilePath& path,
- base::SystemMonitor::RemovableStorageInfo* device_info) const {
+ RemovableStorageInfo* device_info) const {
if (!path.IsAbsolute())
return false;
@@ -361,7 +360,7 @@ void RemovableDeviceNotificationsLinux::UpdateMtab() {
if (MediaStorageUtil::IsRemovableDevice(old_iter->second.device_id)) {
DCHECK(has_priority != priority->second.end());
if (has_priority->second) {
- base::SystemMonitor::Get()->ProcessRemovableStorageDetached(
+ ProcessRemovableStorageDetached(
old_iter->second.device_id);
}
if (priority->second.size() > 1)
@@ -398,7 +397,7 @@ void RemovableDeviceNotificationsLinux::UpdateMtab() {
const MountPointInfo& mount_info =
mount_info_map_.find(mount_point)->second;
DCHECK(MediaStorageUtil::IsRemovableDevice(mount_info.device_id));
- base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
+ ProcessRemovableStorageAttached(
mount_info.device_id, mount_info.device_name, mount_point.value());
}
@@ -464,7 +463,7 @@ void RemovableDeviceNotificationsLinux::AddNewMount(
mount_priority_map_[mount_device][mount_point] = removable;
if (removable) {
- base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
+ ProcessRemovableStorageAttached(
device_id, GetDisplayNameForDevice(partition_size_in_bytes, name),
mount_point.value());
}

Powered by Google App Engine
This is Rietveld 408576698