| 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 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" | 5 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" |
| 6 | 6 |
| 7 #include <errno.h> | 7 #include <errno.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "chrome/browser/certificate_viewer.h" | 29 #include "chrome/browser/certificate_viewer.h" |
| 30 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
| 31 #include "chrome/browser/ui/certificate_dialogs.h" | 31 #include "chrome/browser/ui/certificate_dialogs.h" |
| 32 #include "chrome/browser/ui/chrome_select_file_policy.h" | 32 #include "chrome/browser/ui/chrome_select_file_policy.h" |
| 33 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h" | 33 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h" |
| 34 #include "chrome/browser/ui/webui/certificate_viewer_webui.h" | 34 #include "chrome/browser/ui/webui/certificate_viewer_webui.h" |
| 35 #include "chrome/grit/generated_resources.h" | 35 #include "chrome/grit/generated_resources.h" |
| 36 #include "components/strings/grit/components_strings.h" | 36 #include "components/strings/grit/components_strings.h" |
| 37 #include "content/public/browser/browser_thread.h" | 37 #include "content/public/browser/browser_thread.h" |
| 38 #include "content/public/browser/web_contents.h" | 38 #include "content/public/browser/web_contents.h" |
| 39 #include "net/base/crypto_module.h" | |
| 40 #include "net/base/net_errors.h" | 39 #include "net/base/net_errors.h" |
| 41 #include "net/cert/x509_certificate.h" | 40 #include "net/cert/x509_certificate.h" |
| 42 #include "net/der/input.h" | 41 #include "net/der/input.h" |
| 43 #include "net/der/parser.h" | 42 #include "net/der/parser.h" |
| 44 #include "ui/base/l10n/l10n_util.h" | 43 #include "ui/base/l10n/l10n_util.h" |
| 45 | 44 |
| 46 #if defined(OS_CHROMEOS) | 45 #if defined(OS_CHROMEOS) |
| 47 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" | 46 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" |
| 48 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact
ory.h" | 47 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact
ory.h" |
| 49 #endif | 48 #endif |
| (...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 web_ui()->CallJavascriptFunctionUnsafe("CertificateImportErrorOverlay.show", | 1231 web_ui()->CallJavascriptFunctionUnsafe("CertificateImportErrorOverlay.show", |
| 1233 title_value, error_value, | 1232 title_value, error_value, |
| 1234 cert_error_list); | 1233 cert_error_list); |
| 1235 } | 1234 } |
| 1236 | 1235 |
| 1237 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { | 1236 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { |
| 1238 return web_ui()->GetWebContents()->GetTopLevelNativeWindow(); | 1237 return web_ui()->GetWebContents()->GetTopLevelNativeWindow(); |
| 1239 } | 1238 } |
| 1240 | 1239 |
| 1241 } // namespace options | 1240 } // namespace options |
| OLD | NEW |