| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h" | 5 #include "chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 | 284 |
| 285 //////////////////////////////////////////////////////////////////////////////// | 285 //////////////////////////////////////////////////////////////////////////////// |
| 286 // Platform API | 286 // Platform API |
| 287 | 287 |
| 288 namespace browser { | 288 namespace browser { |
| 289 | 289 |
| 290 void ShowSSLClientCertificateSelector( | 290 void ShowSSLClientCertificateSelector( |
| 291 TabContentsWrapper* wrapper, | 291 TabContentsWrapper* wrapper, |
| 292 net::SSLCertRequestInfo* cert_request_info, | 292 net::SSLCertRequestInfo* cert_request_info, |
| 293 SSLClientAuthHandler* delegate) { | 293 SSLClientAuthHandler* delegate) { |
| 294 #if defined(USE_AURA) | 294 #if defined(USE_AURA) || defined(OS_CHROMEOS) |
| 295 SSLClientCertificateSelectorWebUI::ShowDialog(wrapper, | 295 SSLClientCertificateSelectorWebUI::ShowDialog(wrapper, |
| 296 cert_request_info, | 296 cert_request_info, |
| 297 delegate); | 297 delegate); |
| 298 #else | 298 #else |
| 299 // TODO(rbyers): Remove the IsMoreWebUI check and (ideally) all #ifdefs onnce |
| 300 // we can select exactly one version of this dialog to use for each platform |
| 301 // at build time. http://crbug.com/102775 |
| 299 if (ChromeWebUI::IsMoreWebUI()) | 302 if (ChromeWebUI::IsMoreWebUI()) |
| 300 SSLClientCertificateSelectorWebUI::ShowDialog(wrapper, | 303 SSLClientCertificateSelectorWebUI::ShowDialog(wrapper, |
| 301 cert_request_info, | 304 cert_request_info, |
| 302 delegate); | 305 delegate); |
| 303 else | 306 else |
| 304 ShowNativeSSLClientCertificateSelector(wrapper, | 307 ShowNativeSSLClientCertificateSelector(wrapper, |
| 305 cert_request_info, | 308 cert_request_info, |
| 306 delegate); | 309 delegate); |
| 307 #endif | 310 #endif |
| 308 } | 311 } |
| 309 | 312 |
| 310 } // namespace browser | 313 } // namespace browser |
| OLD | NEW |