| Index: chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
|
| index 80b4b67793776e80a49e08201b7d16ff47327faf..4d75d73ca9784933a2c76fb55eeb4b16b4f319b9 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
|
| @@ -7,11 +7,11 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_TASKS_H_
|
| #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_TASKS_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h"
|
| #include "chrome/browser/chromeos/file_manager/file_tasks.h"
|
|
|
| @@ -60,15 +60,17 @@ class FileManagerPrivateInternalGetFileTasksFunction
|
| bool RunAsync() override;
|
|
|
| private:
|
| - void OnMimeTypesCollected(scoped_ptr<std::vector<std::string> > mime_types);
|
| + void OnMimeTypesCollected(
|
| + std::unique_ptr<std::vector<std::string>> mime_types);
|
|
|
| void OnAreDirectoriesAndMimeTypesCollected(
|
| - scoped_ptr<std::vector<std::string>> mime_types,
|
| - scoped_ptr<std::set<base::FilePath>> path_directory_set);
|
| + std::unique_ptr<std::vector<std::string>> mime_types,
|
| + std::unique_ptr<std::set<base::FilePath>> path_directory_set);
|
|
|
| - scoped_ptr<app_file_handler_util::IsDirectoryCollector>
|
| + std::unique_ptr<app_file_handler_util::IsDirectoryCollector>
|
| is_directory_collector_;
|
| - scoped_ptr<app_file_handler_util::MimeTypeCollector> mime_type_collector_;
|
| + std::unique_ptr<app_file_handler_util::MimeTypeCollector>
|
| + mime_type_collector_;
|
| std::vector<GURL> urls_;
|
| std::vector<base::FilePath> local_paths_;
|
| };
|
|
|