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

Unified Diff: chrome/browser/chromeos/extensions/file_browser_private_api.cc

Issue 10829160: Created a helper function "FindDiskBySourcePath" in DiskMountManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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/chromeos/extensions/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 48fa84f8663fc9fbf5d0a525d22c09a991c8d49b..1f4c8b4e2e4734bd7e8e0bad5e1ee78d1adc8e12 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -108,15 +108,10 @@ const DiskMountManager::Disk* GetVolumeAsDisk(const std::string& mount_path) {
if (mount_point_it == disk_mount_manager->mount_points().end())
return NULL;
- DiskMountManager::DiskMap::const_iterator disk_it =
- disk_mount_manager->disks().find(mount_point_it->second.source_path);
+ const DiskMountManager::Disk* disk = disk_mount_manager->FindDiskBySourcePath(
+ mount_point_it->second.source_path);
- if (disk_it == disk_mount_manager->disks().end() ||
- disk_it->second->is_hidden()) {
- return NULL;
- }
-
- return disk_it->second;
+ return (disk && disk->is_hidden()) ? NULL : disk;
tbarzic 2012/08/06 18:12:08 please make sure ExtensionFileBrowserPrivateApiTes
}
base::DictionaryValue* CreateValueFromDisk(

Powered by Google App Engine
This is Rietveld 408576698