chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_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/bookmarks/bookmark_context_menu_cocoa_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/bookmarks/bookmark_bubble_controller.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h

index 4efe37ce307c832f3095303ffec5f8a349a74a93..65dd32cbb54024faed66e033561545d334bf886e 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h

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

#import <Cocoa/Cocoa.h>

+#include <memory>

#include "base/mac/scoped_nsobject.h"

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

@class BookmarkBarController;

class BookmarkContextMenuController;

@@ -30,7 +31,7 @@ class BookmarkNode;

BookmarkBarController* bookmarkBarController_;

// Helper for receiving C++ callbacks.

- scoped_ptr<BookmarkContextMenuDelegateBridge> bridge_;

+ std::unique_ptr<BookmarkContextMenuDelegateBridge> bridge_;

// The current |bookmarkNode_| for which |bookmarkContextMenuController_| and

// |menuController_| are initialized. Weak, owned by the BookmarkModel.

@@ -38,7 +39,7 @@ class BookmarkNode;

// The cross-platform BookmarkContextMenuController, containing the logic for

// which items and corresponding actions exist in the menu.

- scoped_ptr<BookmarkContextMenuController> bookmarkContextMenuController_;

+ std::unique_ptr<BookmarkContextMenuController> bookmarkContextMenuController_;

// Controller responsible for creating a Cocoa NSMenu from the cross-platform

// SimpleMenuModel owned by the |bookmarkContextMenuController_|.