| 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 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <utility> | 10 #include <utility> |
| 11 | 11 |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/mac/foundation_util.h" | 13 #include "base/mac/foundation_util.h" |
| 14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 15 #include "base/strings/sys_string_conversions.h" | 15 #include "base/strings/sys_string_conversions.h" |
| 16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
| 17 #include "chrome/browser/ssl/ssl_client_auth_observer.h" | 17 #include "chrome/browser/ssl/ssl_client_auth_observer.h" |
| 18 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" | 18 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" |
| 19 #include "chrome/grit/generated_resources.h" | 19 #include "chrome/grit/generated_resources.h" |
| 20 #include "components/guest_view/browser/guest_view_base.h" | 20 #include "components/guest_view/browser/guest_view_base.h" |
| 21 #include "components/strings/grit/components_strings.h" |
| 21 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 22 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 22 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
| 23 #include "content/public/browser/client_certificate_delegate.h" | 24 #include "content/public/browser/client_certificate_delegate.h" |
| 24 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
| 25 #include "grit/components_strings.h" | |
| 26 #include "net/cert/x509_certificate.h" | 26 #include "net/cert/x509_certificate.h" |
| 27 #include "net/cert/x509_util_mac.h" | 27 #include "net/cert/x509_util_mac.h" |
| 28 #include "net/ssl/ssl_cert_request_info.h" | 28 #include "net/ssl/ssl_cert_request_info.h" |
| 29 #include "ui/base/cocoa/window_size_constants.h" | 29 #include "ui/base/cocoa/window_size_constants.h" |
| 30 #include "ui/base/l10n/l10n_util_mac.h" | 30 #include "ui/base/l10n/l10n_util_mac.h" |
| 31 | 31 |
| 32 using content::BrowserThread; | 32 using content::BrowserThread; |
| 33 | 33 |
| 34 @interface SFChooseIdentityPanel (SystemPrivate) | 34 @interface SFChooseIdentityPanel (SystemPrivate) |
| 35 // A system-private interface that dismisses a panel whose sheet was started by | 35 // A system-private interface that dismisses a panel whose sheet was started by |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 } | 270 } |
| 271 | 271 |
| 272 - (void)onConstrainedWindowClosed { | 272 - (void)onConstrainedWindowClosed { |
| 273 observer_->StopObserving(); | 273 observer_->StopObserving(); |
| 274 panel_.reset(); | 274 panel_.reset(); |
| 275 constrainedWindow_.reset(); | 275 constrainedWindow_.reset(); |
| 276 [self release]; | 276 [self release]; |
| 277 } | 277 } |
| 278 | 278 |
| 279 @end | 279 @end |
| OLD | NEW |