Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include <memory>
8
7 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
8 #include "base/memory/scoped_ptr.h"
9 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" 10 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
11 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" 12 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
12 13
13 @class BookmarkBubbleController; 14 @class BookmarkBubbleController;
14 @class BubbleSyncPromoController; 15 @class BubbleSyncPromoController;
15 16
16 namespace bookmarks { 17 namespace bookmarks {
17 class BookmarkBubbleObserver; 18 class BookmarkBubbleObserver;
18 class BookmarkModel; 19 class BookmarkModel;
(...skipping 13 matching lines...) Expand all
32 bookmarks::ManagedBookmarkService* managedBookmarkService_; // weak 33 bookmarks::ManagedBookmarkService* managedBookmarkService_; // weak
33 bookmarks::BookmarkModel* model_; // weak 34 bookmarks::BookmarkModel* model_; // weak
34 const bookmarks::BookmarkNode* node_; // weak 35 const bookmarks::BookmarkNode* node_; // weak
35 36
36 // Inform the observer when the bubble is shown or closed. 37 // Inform the observer when the bubble is shown or closed.
37 bookmarks::BookmarkBubbleObserver* bookmarkBubbleObserver_; // weak 38 bookmarks::BookmarkBubbleObserver* bookmarkBubbleObserver_; // weak
38 39
39 BOOL alreadyBookmarked_; 40 BOOL alreadyBookmarked_;
40 41
41 // Ping me when the bookmark model changes out from under us. 42 // Ping me when the bookmark model changes out from under us.
42 scoped_ptr<BookmarkModelObserverForCocoa> bookmarkObserver_; 43 std::unique_ptr<BookmarkModelObserverForCocoa> bookmarkObserver_;
43 44
44 // Sync promo controller, if the sync promo is displayed. 45 // Sync promo controller, if the sync promo is displayed.
45 base::scoped_nsobject<BubbleSyncPromoController> syncPromoController_; 46 base::scoped_nsobject<BubbleSyncPromoController> syncPromoController_;
46 47
47 IBOutlet NSTextField* bigTitle_; // "Bookmark" or "Bookmark Added!" 48 IBOutlet NSTextField* bigTitle_; // "Bookmark" or "Bookmark Added!"
48 IBOutlet NSTextField* nameTextField_; 49 IBOutlet NSTextField* nameTextField_;
49 IBOutlet NSPopUpButton* folderPopUpButton_; 50 IBOutlet NSPopUpButton* folderPopUpButton_;
50 IBOutlet NSView* syncPromoPlaceholder_; 51 IBOutlet NSView* syncPromoPlaceholder_;
51 } 52 }
52 53
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 87
87 - (void)addFolderNodes:(const bookmarks::BookmarkNode*)parent 88 - (void)addFolderNodes:(const bookmarks::BookmarkNode*)parent
88 toPopUpButton:(NSPopUpButton*)button 89 toPopUpButton:(NSPopUpButton*)button
89 indentation:(int)indentation; 90 indentation:(int)indentation;
90 - (void)setTitle:(NSString*)title 91 - (void)setTitle:(NSString*)title
91 parentFolder:(const bookmarks::BookmarkNode*)parent; 92 parentFolder:(const bookmarks::BookmarkNode*)parent;
92 - (void)setParentFolderSelection:(const bookmarks::BookmarkNode*)parent; 93 - (void)setParentFolderSelection:(const bookmarks::BookmarkNode*)parent;
93 + (NSString*)chooseAnotherFolderString; 94 + (NSString*)chooseAnotherFolderString;
94 - (NSPopUpButton*)folderPopUpButton; 95 - (NSPopUpButton*)folderPopUpButton;
95 @end 96 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698