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" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/browser/ssl/ssl_client_auth_observer.h" |
14 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" | 15 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" |
15 #include "chrome/browser/ssl/ssl_client_auth_observer.h" | |
16 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
18 #include "content/public/browser/web_contents_view.h" | 18 #include "content/public/browser/web_contents_view.h" |
19 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
20 #include "net/base/ssl_cert_request_info.h" | |
21 #include "net/base/x509_certificate.h" | 20 #include "net/base/x509_certificate.h" |
22 #include "net/base/x509_util_mac.h" | 21 #include "net/base/x509_util_mac.h" |
| 22 #include "net/ssl/ssl_cert_request_info.h" |
23 #include "ui/base/cocoa/window_size_constants.h" | 23 #include "ui/base/cocoa/window_size_constants.h" |
24 #include "ui/base/l10n/l10n_util_mac.h" | 24 #include "ui/base/l10n/l10n_util_mac.h" |
25 | 25 |
26 using content::BrowserThread; | 26 using content::BrowserThread; |
27 | 27 |
28 @interface SFChooseIdentityPanel (SystemPrivate) | 28 @interface SFChooseIdentityPanel (SystemPrivate) |
29 // A system-private interface that dismisses a panel whose sheet was started by | 29 // A system-private interface that dismisses a panel whose sheet was started by |
30 // -beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:identities:mess
age: | 30 // -beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:identities:mess
age: |
31 // as though the user clicked the button identified by returnCode. Verified | 31 // as though the user clicked the button identified by returnCode. Verified |
32 // present in 10.5 through 10.8. | 32 // present in 10.5 through 10.8. |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 // NOOP | 224 // NOOP |
225 } | 225 } |
226 | 226 |
227 - (void)onConstrainedWindowClosed { | 227 - (void)onConstrainedWindowClosed { |
228 panel_.reset(); | 228 panel_.reset(); |
229 constrainedWindow_.reset(); | 229 constrainedWindow_.reset(); |
230 [self release]; | 230 [self release]; |
231 } | 231 } |
232 | 232 |
233 @end | 233 @end |
OLD | NEW |