chrome/browser/media_galleries/media_galleries_dialog_controller.cc - Issue 15988011: Refine StorageMonitor storage device getter

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/media_galleries/media_galleries_dialog_controller.cc

Issue 15988011: Refine StorageMonitor storage device getter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 7 years, 6 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/media_galleries/media_file_system_registry.cc ('k') | chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm » ('j') | chrome/browser/storage_monitor/media_storage_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_dialog_controller.cc

diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc

index 0dfe3b7dbf10dc3647c14a92e310e64dbf629688..63e2d3c1399301c3253dc3e60be0e372b44b90ac 100644

--- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc

+++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc

@@ -32,10 +32,10 @@ bool IsAttachedDevice(const std::string& device_id) {

if (!StorageInfo::IsRemovableDevice(device_id))

return false;

- std::vector<StorageInfo> removable_storages =

- StorageMonitor::GetInstance()->GetAttachedStorage();

- for (size_t i = 0; i < removable_storages.size(); ++i) {

- if (removable_storages[i].device_id() == device_id)

+ std::vector<StorageInfo> storages =

+ StorageMonitor::GetInstance()->GetAllAvailableStorages();

+ for (size_t i = 0; i < storages.size(); ++i) {

+ if (storages[i].device_id() == device_id)

return true;

}

return false;