ui/app_list/cocoa/apps_grid_controller.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/app_list/cocoa/apps_grid_controller.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 | « ui/app_list/cocoa/app_list_window_controller_unittest.mm ('k') | ui/app_list/cocoa/apps_grid_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/app_list/cocoa/apps_grid_controller.h

diff --git a/ui/app_list/cocoa/apps_grid_controller.h b/ui/app_list/cocoa/apps_grid_controller.h

index 194f84a3edbce19fde35b92408bdb6b3906e2c04..f1a1b8314ae249ee32f32f14b90ab242fa2b9cff 100644

--- a/ui/app_list/cocoa/apps_grid_controller.h

+++ b/ui/app_list/cocoa/apps_grid_controller.h

@@ -8,8 +8,9 @@

#import <Cocoa/Cocoa.h>

#include <stddef.h>

+#include <memory>

#include "base/mac/scoped_nsobject.h"

-#include "base/memory/scoped_ptr.h"

#include "ui/app_list/app_list_export.h"

#import "ui/app_list/cocoa/app_list_pager_view.h"

#import "ui/app_list/cocoa/scroll_view_with_no_scrollbars.h"

@@ -31,7 +32,7 @@ APP_LIST_EXPORT

NSCollectionViewDelegate> {

@private

app_list::AppListViewDelegate* delegate_; // Weak. Owned by view controller.

- scoped_ptr<app_list::AppsGridDelegateBridge> bridge_;

+ std::unique_ptr<app_list::AppsGridDelegateBridge> bridge_;

base::scoped_nsobject<AppsCollectionViewDragManager> dragManager_;

base::scoped_nsobject<NSMutableArray> pages_;

« no previous file with comments | « ui/app_list/cocoa/app_list_window_controller_unittest.mm ('k') | ui/app_list/cocoa/apps_grid_controller_unittest.mm » ('j') | no next file with comments »