| Index: chrome/browser/chromeos/file_manager/file_tasks.h
|
| diff --git a/chrome/browser/chromeos/file_manager/file_tasks.h b/chrome/browser/chromeos/file_manager/file_tasks.h
|
| index b357cc2f43ee0949d471c27969e016729476f67d..3af609f55bc4640fa7a33be9d0cbb008e0deb06c 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_tasks.h
|
| +++ b/chrome/browser/chromeos/file_manager/file_tasks.h
|
| @@ -167,14 +167,15 @@ struct TaskDescriptor {
|
| class FullTaskDescriptor {
|
| public:
|
| FullTaskDescriptor(const TaskDescriptor& task_descriptor,
|
| - const std::string& task_title,
|
| + const base::string16& task_title,
|
| const GURL& icon_url,
|
| bool is_default,
|
| bool is_generic_file_handler);
|
| +
|
| const TaskDescriptor& task_descriptor() const { return task_descriptor_; }
|
|
|
| // The title of the task.
|
| - const std::string& task_title() const { return task_title_; }
|
| + const base::string16& task_title() const { return task_title_; }
|
| // The icon URL for the task (ex. app icon)
|
| const GURL& icon_url() const { return icon_url_; }
|
|
|
| @@ -193,7 +194,7 @@ class FullTaskDescriptor {
|
|
|
| private:
|
| TaskDescriptor task_descriptor_;
|
| - std::string task_title_;
|
| + base::string16 task_title_;
|
| GURL icon_url_;
|
| bool is_default_;
|
| bool is_generic_file_handler_;
|
|
|