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

Side by Side Diff: chrome/browser/ui/cocoa/certificate_viewer_mac.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 | Annotate | Revision Log
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 "base/memory/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 11 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" 12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
13 13
14 class SSLCertificateViewerCocoaBridge; 14 class SSLCertificateViewerCocoaBridge;
15 @class SFCertificatePanel; 15 @class SFCertificatePanel;
16 16
17 namespace net { 17 namespace net {
18 class X509Certificate; 18 class X509Certificate;
19 } 19 }
20 20
21 @interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> { 21 @interface SSLCertificateViewerCocoa : NSObject<ConstrainedWindowSheet> {
22 @private 22 @private
23 // The corresponding list of certificates. 23 // The corresponding list of certificates.
24 scoped_nsobject<NSArray> certificates_; 24 base::scoped_nsobject<NSArray> certificates_;
25 scoped_ptr<SSLCertificateViewerCocoaBridge> observer_; 25 scoped_ptr<SSLCertificateViewerCocoaBridge> observer_;
26 scoped_nsobject<SFCertificatePanel> panel_; 26 base::scoped_nsobject<SFCertificatePanel> panel_;
27 scoped_ptr<ConstrainedWindowMac> constrainedWindow_; 27 scoped_ptr<ConstrainedWindowMac> constrainedWindow_;
28 scoped_nsobject<NSWindow> overlayWindow_; 28 base::scoped_nsobject<NSWindow> overlayWindow_;
29 BOOL closePending_; 29 BOOL closePending_;
30 // A copy of the sheet's frame used to restore on show. 30 // A copy of the sheet's frame used to restore on show.
31 NSRect oldSheetFrame_; 31 NSRect oldSheetFrame_;
32 // A copy of the sheet's |autoresizesSubviews| flag to restore on show. 32 // A copy of the sheet's |autoresizesSubviews| flag to restore on show.
33 BOOL oldResizesSubviews_; 33 BOOL oldResizesSubviews_;
34 } 34 }
35 35
36 - (id)initWithCertificate:(net::X509Certificate*)certificate; 36 - (id)initWithCertificate:(net::X509Certificate*)certificate;
37 37
38 - (void)displayForWebContents:(content::WebContents*)webContents; 38 - (void)displayForWebContents:(content::WebContents*)webContents;
39 39
40 - (NSWindow*)overlayWindow; 40 - (NSWindow*)overlayWindow;
41 41
42 @end 42 @end
43 43
44 #endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_ 44 #endif // CHROME_BROWSER_UI_COCOA_CERTIFICATE_VIEWER_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698