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

Side by Side Diff: chrome/browser/ui/views/ssl_client_certificate_selector.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jam review changes Created 7 years 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 | Annotate | Revision Log
OLDNEW
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/views/ssl_client_certificate_selector.h" 5 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/certificate_viewer.h" 11 #include "chrome/browser/certificate_viewer.h"
12 #include "chrome/browser/ui/crypto_module_password_dialog.h"
13 #include "chrome/browser/ui/views/constrained_window_views.h" 12 #include "chrome/browser/ui/views/constrained_window_views.h"
14 #include "components/web_modal/web_contents_modal_dialog_host.h" 13 #include "components/web_modal/web_contents_modal_dialog_host.h"
15 #include "components/web_modal/web_contents_modal_dialog_manager.h" 14 #include "components/web_modal/web_contents_modal_dialog_manager.h"
16 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" 15 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
17 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
18 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
19 #include "content/public/browser/web_contents_view.h" 18 #include "content/public/browser/web_contents_view.h"
20 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
21 #include "net/cert/x509_certificate.h" 20 #include "net/cert/x509_certificate.h"
22 #include "net/ssl/ssl_cert_request_info.h" 21 #include "net/ssl/ssl_cert_request_info.h"
23 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/models/table_model.h" 23 #include "ui/base/models/table_model.h"
25 #include "ui/base/models/table_model_observer.h" 24 #include "ui/base/models/table_model_observer.h"
26 #include "ui/gfx/native_widget_types.h" 25 #include "ui/gfx/native_widget_types.h"
27 #include "ui/views/controls/button/label_button.h" 26 #include "ui/views/controls/button/label_button.h"
28 #include "ui/views/controls/label.h" 27 #include "ui/views/controls/label.h"
29 #include "ui/views/controls/table/table_view.h" 28 #include "ui/views/controls/table/table_view.h"
30 #include "ui/views/layout/grid_layout.h" 29 #include "ui/views/layout/grid_layout.h"
31 #include "ui/views/layout/layout_constants.h" 30 #include "ui/views/layout/layout_constants.h"
32 #include "ui/views/widget/widget.h" 31 #include "ui/views/widget/widget.h"
33 #include "ui/views/window/dialog_client_view.h" 32 #include "ui/views/window/dialog_client_view.h"
34 33
34 #if defined(USE_NSS)
35 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
36 #endif
37
35 using content::BrowserThread; 38 using content::BrowserThread;
36 using content::WebContents; 39 using content::WebContents;
37 using web_modal::WebContentsModalDialogManager; 40 using web_modal::WebContentsModalDialogManager;
38 using web_modal::WebContentsModalDialogManagerDelegate; 41 using web_modal::WebContentsModalDialogManagerDelegate;
39 42
40 namespace { 43 namespace {
41 44
42 // The dimensions of the certificate selector table view, in pixels. 45 // The dimensions of the certificate selector table view, in pixels.
43 static const int kTableViewWidth = 400; 46 static const int kTableViewWidth = 400;
44 static const int kTableViewHeight = 100; 47 static const int kTableViewHeight = 100;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 const net::HttpNetworkSession* network_session, 318 const net::HttpNetworkSession* network_session,
316 net::SSLCertRequestInfo* cert_request_info, 319 net::SSLCertRequestInfo* cert_request_info,
317 const chrome::SelectCertificateCallback& callback) { 320 const chrome::SelectCertificateCallback& callback) {
318 DVLOG(1) << __FUNCTION__ << " " << contents; 321 DVLOG(1) << __FUNCTION__ << " " << contents;
319 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 322 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
320 (new SSLClientCertificateSelector( 323 (new SSLClientCertificateSelector(
321 contents, network_session, cert_request_info, callback))->Init(); 324 contents, network_session, cert_request_info, callback))->Init();
322 } 325 }
323 326
324 } // namespace chrome 327 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698