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

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

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

index 90b524951bdce64a2c94db9ff73ccbb0cfb910a6..d4748223026f58eff418bd750a1f95fd922b8ab6 100644

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

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

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

#import <Cocoa/Cocoa.h>

+#include <memory>

#include "base/mac/scoped_nsobject.h"

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

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

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"

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

@@ -39,7 +40,7 @@ class ManagedBookmarkService;

BOOL alreadyBookmarked_;

// Ping me when the bookmark model changes out from under us.

- scoped_ptr<BookmarkModelObserverForCocoa> bookmarkObserver_;

+ std::unique_ptr<BookmarkModelObserverForCocoa> bookmarkObserver_;

// Sync promo controller, if the sync promo is displayed.

base::scoped_nsobject<BubbleSyncPromoController> syncPromoController_;