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

Unified Diff: chrome/browser/ui/app_list/fast_show_pickler.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/ui/app_list/fast_show_pickler.cc
diff --git a/chrome/browser/ui/app_list/fast_show_pickler.cc b/chrome/browser/ui/app_list/fast_show_pickler.cc
index 3dc3cdaf86b665cb97ea6d90b6860c52fec4ea98..6b4b4fbddbfc7ee562f4f9476cd4fa7a8633f6c6 100644
--- a/chrome/browser/ui/app_list/fast_show_pickler.cc
+++ b/chrome/browser/ui/app_list/fast_show_pickler.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/app_list/fast_show_pickler.h"
#include <stddef.h>
+#include <utility>
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/app_list/app_list_item.h"
@@ -165,7 +166,7 @@ scoped_ptr<AppListItem> FastShowPickler::UnpickleAppListItem(
if (!UnpickleImage(it, &icon))
return scoped_ptr<AppListItem>();
result->SetIcon(icon);
- return result.Pass();
+ return result;
}
bool FastShowPickler::PickleAppListItem(base::Pickle* pickle,
@@ -205,7 +206,7 @@ scoped_ptr<base::Pickle> FastShowPickler::PickleAppListModelForFastShow(
return scoped_ptr<base::Pickle>();
}
}
- return result.Pass();
+ return result;
}
void FastShowPickler::CopyOver(AppListModel* src, AppListModel* dest) {
@@ -214,7 +215,7 @@ void FastShowPickler::CopyOver(AppListModel* src, AppListModel* dest) {
AppListItem* src_item = src->top_level_item_list()->item_at(i);
scoped_ptr<AppListItem> dest_item(new AppListItem(src_item->id()));
CopyOverItem(src_item, dest_item.get());
- dest->AddItemToFolder(dest_item.Pass(), src_item->folder_id());
+ dest->AddItemToFolder(std::move(dest_item), src_item->folder_id());
}
}
@@ -232,12 +233,12 @@ scoped_ptr<AppListModel> FastShowPickler::UnpickleAppListModelForFastShow(
scoped_ptr<AppListModel> model(new AppListModel);
for (int i = 0; i < app_count; ++i) {
- scoped_ptr<AppListItem> item(UnpickleAppListItem(&it).Pass());
+ scoped_ptr<AppListItem> item(UnpickleAppListItem(&it));
if (!item)
return scoped_ptr<AppListModel>();
std::string folder_id = item->folder_id();
- model->AddItemToFolder(item.Pass(), folder_id);
+ model->AddItemToFolder(std::move(item), folder_id);
}
- return model.Pass();
+ return model;
}
« no previous file with comments | « chrome/browser/ui/app_list/app_list_syncable_service.cc ('k') | chrome/browser/ui/app_list/launcher_page_event_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698