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

Index: chrome/browser/ui/cocoa/profiles/profile_menu_controller.h

diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.h b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.h

index 42c3b53251ff2b61f18ef2748d5a773c5f8895e3..7aca5ca0ed64bebc3e9025d14a81aa7a027fbf36 100644

--- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.h

+++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.h

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

#import <Cocoa/Cocoa.h>

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

+#include <memory>

class AvatarMenu;

class Browser;

@@ -22,11 +22,11 @@ class Observer;

@interface ProfileMenuController : NSObject {

@private

// The controller for the profile submenu.

- scoped_ptr<AvatarMenu> avatarMenu_;

+ std::unique_ptr<AvatarMenu> avatarMenu_;

// An observer to be notified when the active browser changes and when the

// menu model changes.

- scoped_ptr<ProfileMenuControllerInternal::Observer> observer_;

+ std::unique_ptr<ProfileMenuControllerInternal::Observer> observer_;

// The main menu item to which the profile menu is attached.

NSMenuItem* mainMenuItem_; // weak