chrome/browser/ui/cocoa/extensions/browser_action_button.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/extensions/browser_action_button.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/exclusive_access_bubble_window_controller.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/browser_action_button.h

diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.h b/chrome/browser/ui/cocoa/extensions/browser_action_button.h

index bcd543e0a4222842630e26fddbc579bc713ed626..645243ae8ee123db96544bddd909b3385848546d 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.h

+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.h

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

#import <Cocoa/Cocoa.h>

+#include <memory>

#import "base/mac/scoped_nsobject.h"

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

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

#import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"

@@ -32,7 +33,7 @@ extern NSString* const kBrowserActionButtonDragEndNotification;

ToolbarActionViewController* viewController_;

// The bridge between the view controller and this object.

- scoped_ptr<ToolbarActionViewDelegateBridge> viewControllerDelegate_;

+ std::unique_ptr<ToolbarActionViewDelegateBridge> viewControllerDelegate_;

// The context menu controller.

base::scoped_nsobject<MenuController> contextMenuController_;