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

Side by Side Diff: chrome/browser/ui/cocoa/certificate_viewer_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_CERTIFICATE_VIEWER_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
6 6
7 #define CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_ 7 #define CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
8 8
9 #include <memory>
10
9 #include "base/mac/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
10 #include "base/memory/scoped_ptr.h"
11 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" 13 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
13 14
14 class SSLCertificateViewerCocoaBridge; 15 class SSLCertificateViewerCocoaBridge;
15 @class SFCertificatePanel; 16 @class SFCertificatePanel;
16 17
17 namespace net { 18 namespace net {
18 class X509Certificate; 19 class X509Certificate;
19 } 20 }
20 21
21 @interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> { 22 @interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> {
22 @private 23 @private
23 // The corresponding list of certificates. 24 // The corresponding list of certificates.
24 base::scoped_nsobject<NSArray> certificates_; 25 base::scoped_nsobject<NSArray> certificates_;
25 scoped_ptr<SSLCertificateViewerCocoaBridge> observer_; 26 std::unique_ptr<SSLCertificateViewerCocoaBridge> observer_;
26 base::scoped_nsobject<SFCertificatePanel> panel_; 27 base::scoped_nsobject<SFCertificatePanel> panel_;
27 scoped_ptr<ConstrainedWindowMac> constrainedWindow_; 28 std::unique_ptr<ConstrainedWindowMac> constrainedWindow_;
28 base::scoped_nsobject<NSWindow> overlayWindow_; 29 base::scoped_nsobject<NSWindow> overlayWindow_;
29 BOOL closePending_; 30 BOOL closePending_;
30 // A copy of the sheet's frame used to restore on show. 31 // A copy of the sheet's frame used to restore on show.
31 NSRect oldSheetFrame_; 32 NSRect oldSheetFrame_;
32 // A copy of the sheet's |autoresizesSubviews| flag to restore on show. 33 // A copy of the sheet's |autoresizesSubviews| flag to restore on show.
33 BOOL oldResizesSubviews_; 34 BOOL oldResizesSubviews_;
34 } 35 }
35 36
36 - (id)initWithCertificate:(net::X509Certificate*)certificate; 37 - (id)initWithCertificate:(net::X509Certificate*)certificate;
37 38
38 - (void)displayForWebContents:(content::WebContents*)webContents; 39 - (void)displayForWebContents:(content::WebContents*)webContents;
39 40
40 - (NSWindow*)overlayWindow; 41 - (NSWindow*)overlayWindow;
41 42
42 @end 43 @end
43 44
44 #endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_ 45 #endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm ('k') | chrome/browser/ui/cocoa/cocoa_profile_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698