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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_TOOLBAR_ACTIONS_BAR_BUBBLE_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_TOOLBAR_ACTIONS_BAR_BUBBLE_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_TOOLBAR_ACTIONS_BAR_BUBBLE_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_TOOLBAR_ACTIONS_BAR_BUBBLE_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include <memory>
11
11 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" 12 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
12 13
13 class ToolbarActionsBarBubbleDelegate; 14 class ToolbarActionsBarBubbleDelegate;
14 15
15 // A bubble that hangs off the toolbar actions bar, with a minimum of a heading, 16 // A bubble that hangs off the toolbar actions bar, with a minimum of a heading,
16 // some text content, and an "action" button. The bubble can also, optionally, 17 // some text content, and an "action" button. The bubble can also, optionally,
17 // have a learn more link and/or a dismiss button. 18 // have a learn more link and/or a dismiss button.
18 @interface ToolbarActionsBarBubbleMac : BaseBubbleController { 19 @interface ToolbarActionsBarBubbleMac : BaseBubbleController {
19 // Whether or not the bubble has been acknowledged. 20 // Whether or not the bubble has been acknowledged.
20 BOOL acknowledged_; 21 BOOL acknowledged_;
21 22
22 // The action button. The exact meaning of this is dependent on the bubble. 23 // The action button. The exact meaning of this is dependent on the bubble.
23 // Required. 24 // Required.
24 NSButton* actionButton_; 25 NSButton* actionButton_;
25 26
26 // The list of items to display. Optional. 27 // The list of items to display. Optional.
27 NSTextField* itemList_; 28 NSTextField* itemList_;
28 29
29 // The dismiss button. Optional. 30 // The dismiss button. Optional.
30 NSButton* dismissButton_; 31 NSButton* dismissButton_;
31 32
32 // The "learn more" link-style button. Optional. 33 // The "learn more" link-style button. Optional.
33 NSButton* learnMoreButton_; 34 NSButton* learnMoreButton_;
34 35
35 // This bubble's delegate. 36 // This bubble's delegate.
36 scoped_ptr<ToolbarActionsBarBubbleDelegate> delegate_; 37 std::unique_ptr<ToolbarActionsBarBubbleDelegate> delegate_;
37 } 38 }
38 39
39 // Creates the bubble for a parent window but does not show it. 40 // Creates the bubble for a parent window but does not show it.
40 - (id)initWithParentWindow:(NSWindow*)parentWindow 41 - (id)initWithParentWindow:(NSWindow*)parentWindow
41 anchorPoint:(NSPoint)anchorPoint 42 anchorPoint:(NSPoint)anchorPoint
42 delegate:(scoped_ptr<ToolbarActionsBarBubbleDelegate>) 43 delegate:(std::unique_ptr<ToolbarActionsBarBubbleDelegate>)
43 delegate; 44 delegate;
44 45
45 // Toggles animation for testing purposes. 46 // Toggles animation for testing purposes.
46 + (void)setAnimationEnabledForTesting:(BOOL)enabled; 47 + (void)setAnimationEnabledForTesting:(BOOL)enabled;
47 48
48 @property(readonly, nonatomic) NSButton* actionButton; 49 @property(readonly, nonatomic) NSButton* actionButton;
49 @property(readonly, nonatomic) NSTextField* itemList; 50 @property(readonly, nonatomic) NSTextField* itemList;
50 @property(readonly, nonatomic) NSButton* dismissButton; 51 @property(readonly, nonatomic) NSButton* dismissButton;
51 @property(readonly, nonatomic) NSButton* learnMoreButton; 52 @property(readonly, nonatomic) NSButton* learnMoreButton;
52 53
53 @end 54 @end
54 55
55 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_TOOLBAR_ACTIONS_BAR_BUBBLE_MAC_H_ 56 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_TOOLBAR_ACTIONS_BAR_BUBBLE_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698