chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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/cocoa/toolbar/app_toolbar_button_cell.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h ('k') | chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h

diff --git a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h

index 6e5eb1ca9a02e0adc2b3e31bc48e6bbf12660edd..cf3273e9212e9b36f61d4c042274437cc29624e4 100644

--- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h

+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h

@@ -7,7 +7,8 @@

#import <Cocoa/Cocoa.h>

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

+#include <memory>

#import "chrome/browser/ui/cocoa/clickhold_button_cell.h"

#include "chrome/browser/ui/toolbar/app_menu_icon_painter.h"

@@ -17,8 +18,8 @@ class AppMenuIconPainterDelegateMac;

// and paint severity levels.

@interface AppToolbarButtonCell : ClickHoldButtonCell {

@private

- scoped_ptr<AppMenuIconPainter> iconPainter_;

- scoped_ptr<AppMenuIconPainterDelegateMac> delegate_;

+ std::unique_ptr<AppMenuIconPainter> iconPainter_;

+ std::unique_ptr<AppMenuIconPainterDelegateMac> delegate_;

}

- (void)setSeverity:(AppMenuIconPainter::Severity)severity