Chromium Code Reviews| 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 2a22fb79a9c0178d4991b2f97d631811f85f90ff..56c0f8972dee78eb532619d3f533259e907c68ce 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 = |
|
hashimoto
2013/05/24 08:38:57
nit: Use size_t to iterate over a vector.
mtomasz
2013/05/24 10:37:59
Done.
|
| 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 { |