OLD | NEW |
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 "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h" | 5 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h" |
6 | 6 |
7 #import <SecurityInterface/SFChooseIdentityPanel.h> | 7 #import <SecurityInterface/SFChooseIdentityPanel.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/mac/foundation_util.h" | 10 #include "base/mac/foundation_util.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 SSLClientAuthObserverCocoaBridge( | 42 SSLClientAuthObserverCocoaBridge( |
43 const net::HttpNetworkSession* network_session, | 43 const net::HttpNetworkSession* network_session, |
44 net::SSLCertRequestInfo* cert_request_info, | 44 net::SSLCertRequestInfo* cert_request_info, |
45 const chrome::SelectCertificateCallback& callback, | 45 const chrome::SelectCertificateCallback& callback, |
46 SSLClientCertificateSelectorCocoa* controller) | 46 SSLClientCertificateSelectorCocoa* controller) |
47 : SSLClientAuthObserver(network_session, cert_request_info, callback), | 47 : SSLClientAuthObserver(network_session, cert_request_info, callback), |
48 controller_(controller) { | 48 controller_(controller) { |
49 } | 49 } |
50 | 50 |
51 // SSLClientAuthObserver implementation: | 51 // SSLClientAuthObserver implementation: |
52 virtual void OnCertSelectedByNotification() OVERRIDE { | 52 virtual void OnCertSelectedByNotification() override { |
53 [controller_ closeWebContentsModalDialog]; | 53 [controller_ closeWebContentsModalDialog]; |
54 } | 54 } |
55 | 55 |
56 // ConstrainedWindowMacDelegate implementation: | 56 // ConstrainedWindowMacDelegate implementation: |
57 virtual void OnConstrainedWindowClosed( | 57 virtual void OnConstrainedWindowClosed( |
58 ConstrainedWindowMac* window) OVERRIDE { | 58 ConstrainedWindowMac* window) override { |
59 // |onConstrainedWindowClosed| will delete the sheet which might be still | 59 // |onConstrainedWindowClosed| will delete the sheet which might be still |
60 // in use higher up the call stack. Wait for the next cycle of the event | 60 // in use higher up the call stack. Wait for the next cycle of the event |
61 // loop to call this function. | 61 // loop to call this function. |
62 [controller_ performSelector:@selector(onConstrainedWindowClosed) | 62 [controller_ performSelector:@selector(onConstrainedWindowClosed) |
63 withObject:nil | 63 withObject:nil |
64 afterDelay:0]; | 64 afterDelay:0]; |
65 } | 65 } |
66 | 66 |
67 private: | 67 private: |
68 SSLClientCertificateSelectorCocoa* controller_; // weak | 68 SSLClientCertificateSelectorCocoa* controller_; // weak |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 } | 230 } |
231 | 231 |
232 - (void)onConstrainedWindowClosed { | 232 - (void)onConstrainedWindowClosed { |
233 observer_->StopObserving(); | 233 observer_->StopObserving(); |
234 panel_.reset(); | 234 panel_.reset(); |
235 constrainedWindow_.reset(); | 235 constrainedWindow_.reset(); |
236 [self release]; | 236 [self release]; |
237 } | 237 } |
238 | 238 |
239 @end | 239 @end |
OLD | NEW |