Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: chrome/browser/ui/webui/settings/certificates_handler.cc

Issue 2724013002: net: remove CryptoModule class (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/settings/certificates_handler.h" 5 #include "chrome/browser/ui/webui/settings/certificates_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 17 matching lines...) Expand all
28 #include "chrome/browser/browser_process.h" 28 #include "chrome/browser/browser_process.h"
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 "content/public/browser/browser_thread.h" 36 #include "content/public/browser/browser_thread.h"
37 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
38 #include "net/base/crypto_module.h"
39 #include "net/base/net_errors.h" 38 #include "net/base/net_errors.h"
40 #include "net/cert/x509_certificate.h" 39 #include "net/cert/x509_certificate.h"
41 #include "net/der/input.h" 40 #include "net/der/input.h"
42 #include "net/der/parser.h" 41 #include "net/der/parser.h"
43 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
44 43
45 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
46 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" 45 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
47 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h" 46 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h"
48 #endif 47 #endif
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 error_info->Set(kCertificateErrors, 1139 error_info->Set(kCertificateErrors,
1141 base::WrapUnique(cert_error_list.release())); 1140 base::WrapUnique(cert_error_list.release()));
1142 RejectCallback(*error_info); 1141 RejectCallback(*error_info);
1143 } 1142 }
1144 1143
1145 gfx::NativeWindow CertificatesHandler::GetParentWindow() const { 1144 gfx::NativeWindow CertificatesHandler::GetParentWindow() const {
1146 return web_ui()->GetWebContents()->GetTopLevelNativeWindow(); 1145 return web_ui()->GetWebContents()->GetTopLevelNativeWindow();
1147 } 1146 }
1148 1147
1149 } // namespace settings 1148 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/certificate_manager_handler.cc ('k') | chromeos/network/onc/onc_certificate_importer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698