| Index: chrome/browser/web_applications/web_app.cc
|
| diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
|
| index 5884760fa0d135acfe41b6d933933e3008fa3ca4..2836f53545e536ce8c81d20212d438fa3136a411 100644
|
| --- a/chrome/browser/web_applications/web_app.cc
|
| +++ b/chrome/browser/web_applications/web_app.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/web_applications/web_app.h"
|
|
|
| #include <stddef.h>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -118,14 +119,14 @@ void OnImageLoaded(scoped_ptr<web_app::ShortcutInfo> shortcut_info,
|
| shortcut_info->favicon = image_family;
|
| }
|
|
|
| - callback.Run(shortcut_info.Pass(), file_handlers_info);
|
| + callback.Run(std::move(shortcut_info), file_handlers_info);
|
| }
|
|
|
| void IgnoreFileHandlersInfo(
|
| const web_app::ShortcutInfoCallback& shortcut_info_callback,
|
| scoped_ptr<web_app::ShortcutInfo> shortcut_info,
|
| const extensions::FileHandlersInfo& file_handlers_info) {
|
| - shortcut_info_callback.Run(shortcut_info.Pass());
|
| + shortcut_info_callback.Run(std::move(shortcut_info));
|
| }
|
|
|
| void ScheduleCreatePlatformShortcut(
|
| @@ -411,14 +412,14 @@ void CreateShortcutsWithInfo(
|
| return;
|
| }
|
|
|
| - ScheduleCreatePlatformShortcut(reason, locations, shortcut_info.Pass(),
|
| + ScheduleCreatePlatformShortcut(reason, locations, std::move(shortcut_info),
|
| file_handlers_info);
|
| }
|
|
|
| void CreateNonAppShortcut(const ShortcutLocations& locations,
|
| scoped_ptr<ShortcutInfo> shortcut_info) {
|
| ScheduleCreatePlatformShortcut(SHORTCUT_CREATION_AUTOMATED, locations,
|
| - shortcut_info.Pass(),
|
| + std::move(shortcut_info),
|
| extensions::FileHandlersInfo());
|
| }
|
|
|
|
|