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

Unified Diff: chrome/browser/media_gallery/media_file_system_registry.cc

Issue 12208079: Move TransientDeviceId from MediFileSystemRegistry to RemovableStorageNotifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 7 years, 10 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/media_gallery/media_file_system_registry.cc
diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc
index 3560dc108b9d996d3ac5d1249df8534a2be68d06..fd085ac35057f0f90a05d1232899cf53861207d9 100644
--- a/chrome/browser/media_gallery/media_file_system_registry.cc
+++ b/chrome/browser/media_gallery/media_file_system_registry.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/system_monitor/media_storage_util.h"
#include "chrome/browser/system_monitor/removable_storage_notifications.h"
+#include "chrome/browser/system_monitor/transient_device_ids.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -401,9 +402,9 @@ class ExtensionGalleriesHost
uint64 GetTransientIdForRemovableDeviceId(const std::string& device_id) {
if (!MediaStorageUtil::IsRemovableDevice(device_id))
return 0;
- MediaFileSystemRegistry* registry =
- file_system_context_->GetMediaFileSystemRegistry();
- return registry->GetTransientIdForDeviceId(device_id);
+ TransientDeviceIds* transient_ids =
+ RemovableStorageNotifications::GetInstance()->transient_device_ids();
+ return transient_ids->GetTransientIdForDeviceId(device_id);
}
// This code is deprecated and should be removed. See http://crbug.com/170138
@@ -628,11 +629,6 @@ size_t MediaFileSystemRegistry::GetExtensionHostCountForTests() const {
return extension_hosts_map_.size();
}
-uint64 MediaFileSystemRegistry::GetTransientIdForDeviceId(
- const std::string& device_id) {
- return transient_device_ids_.GetTransientIdForDeviceId(device_id);
-}
-
/******************
* Private methods
******************/

Powered by Google App Engine
This is Rietveld 408576698