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

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

Issue 15975004: Replace sets with vectors when storing file handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 7 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_manager/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
index 45770a3839bfbc516058ec140d4753f11931ae43..301620387848def369d6579888b5df3ba82b1602 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
@@ -1041,8 +1041,8 @@ bool GetFileTasksFileBrowserFunction::RunImpl() {
// the extension tasks to the Drive task list. We know there aren't duplicates
// because they're entirely different kinds of tasks, but there could be both
// kinds of tasks for a file type (an image file, for instance).
- std::set<const FileBrowserHandler*> common_tasks;
- std::set<const FileBrowserHandler*> default_tasks;
+ file_handler_util::FileBrowserHandlerList common_tasks;
+ file_handler_util::FileBrowserHandlerList default_tasks;
if (!file_handler_util::FindCommonTasks(profile_, file_urls, &common_tasks))
return false;
file_handler_util::FindDefaultTasks(profile_, file_paths,
@@ -1050,7 +1050,7 @@ bool GetFileTasksFileBrowserFunction::RunImpl() {
ExtensionService* service =
extensions::ExtensionSystem::Get(profile_)->extension_service();
- for (std::set<const FileBrowserHandler*>::const_iterator iter =
+ for (file_handler_util::FileBrowserHandlerList::const_iterator iter =
common_tasks.begin();
iter != common_tasks.end();
++iter) {
@@ -1074,7 +1074,8 @@ bool GetFileTasksFileBrowserFunction::RunImpl() {
// Only set the default if there isn't already a default set.
if (!default_already_set &&
- default_tasks.find(*iter) != default_tasks.end()) {
+ std::find(default_tasks.begin(), default_tasks.end(), *iter) !=
+ default_tasks.end()) {
task->SetBoolean("isDefault", true);
default_already_set = true;
} else {

Powered by Google App Engine
This is Rietveld 408576698