chrome/browser/ui/app_list/app_list_syncable_service.cc - Issue 657333002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 657333002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months 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

« no previous file with comments | « chrome/browser/ui/android/infobars/translate_infobar.cc ('k') | chrome/browser/ui/app_list/extension_app_model_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_syncable_service.cc

diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc

index f0e7fcf32764c0aecd1bb93887092bd3214a01b6..ab61fc81194168e555213684bb795668862fb931 100644

--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc

+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc

@@ -919,8 +919,8 @@ std::string AppListSyncableService::FindOrCreateOemFolder() {

if (!oem_folder) {

scoped_ptr<AppListFolderItem> new_folder(new AppListFolderItem(

kOemFolderId, AppListFolderItem::FOLDER_TYPE_OEM));

- oem_folder = static_cast<AppListFolderItem*>(

- model_->AddItem(new_folder.PassAs<app_list::AppListItem>()));

+ oem_folder =

+ static_cast<AppListFolderItem*>(model_->AddItem(new_folder.Pass()));

SyncItem* oem_sync_item = FindSyncItem(kOemFolderId);

if (oem_sync_item) {

VLOG(1) << "Creating OEM folder from existing sync item: "