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

Side by Side Diff: chrome/browser/ui/cocoa/global_error_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 #ifndef CHROME_BROWSER_UI_COCOA_GLOBAL_ERROR_BUBBLE_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_GLOBAL_ERROR_BUBBLE_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_GLOBAL_ERROR_BUBBLE_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_GLOBAL_ERROR_BUBBLE_CONTROLLER_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 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" 13 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
13 14
14 class Browser; 15 class Browser;
15 class GlobalErrorWithStandardBubble; 16 class GlobalErrorWithStandardBubble;
16 @class GTMUILocalizerAndLayoutTweaker; 17 @class GTMUILocalizerAndLayoutTweaker;
17 @class GTMWidthBasedTweaker; 18 @class GTMWidthBasedTweaker;
18 class Profile; 19 class Profile;
19 20
20 namespace GlobalErrorBubbleControllerInternal { 21 namespace GlobalErrorBubbleControllerInternal {
21 class Bridge; 22 class Bridge;
22 } 23 }
23 24
24 // This is a bubble view shown from the app menu to display information 25 // This is a bubble view shown from the app menu to display information
25 // about a global error. 26 // about a global error.
26 @interface GlobalErrorBubbleController : BaseBubbleController { 27 @interface GlobalErrorBubbleController : BaseBubbleController {
27 @private 28 @private
28 base::WeakPtr<GlobalErrorWithStandardBubble> error_; 29 base::WeakPtr<GlobalErrorWithStandardBubble> error_;
29 scoped_ptr<GlobalErrorBubbleControllerInternal::Bridge> bridge_; 30 std::unique_ptr<GlobalErrorBubbleControllerInternal::Bridge> bridge_;
30 Browser* browser_; 31 Browser* browser_;
31 32
32 IBOutlet NSImageView* iconView_; 33 IBOutlet NSImageView* iconView_;
33 IBOutlet NSTextField* title_; 34 IBOutlet NSTextField* title_;
34 IBOutlet NSTextField* message_; 35 IBOutlet NSTextField* message_;
35 IBOutlet NSButton* acceptButton_; 36 IBOutlet NSButton* acceptButton_;
36 IBOutlet NSButton* cancelButton_; 37 IBOutlet NSButton* cancelButton_;
37 IBOutlet GTMUILocalizerAndLayoutTweaker* layoutTweaker_; 38 IBOutlet GTMUILocalizerAndLayoutTweaker* layoutTweaker_;
38 IBOutlet GTMWidthBasedTweaker* buttonContainer_; 39 IBOutlet GTMWidthBasedTweaker* buttonContainer_;
39 } 40 }
40 41
41 - (IBAction)onAccept:(id)sender; 42 - (IBAction)onAccept:(id)sender;
42 - (IBAction)onCancel:(id)sender; 43 - (IBAction)onCancel:(id)sender;
43 44
44 - (void)close; 45 - (void)close;
45 46
46 @end 47 @end
47 48
48 #endif // CHROME_BROWSER_UI_COCOA_GLOBAL_ERROR_BUBBLE_CONTROLLER_H_ 49 #endif // CHROME_BROWSER_UI_COCOA_GLOBAL_ERROR_BUBBLE_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698