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/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/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 column_set->AddColumn( | 115 column_set->AddColumn( |
116 views::GridLayout::FILL, views::GridLayout::FILL, | 116 views::GridLayout::FILL, views::GridLayout::FILL, |
117 1, views::GridLayout::USE_PREF, 0, 0); | 117 1, views::GridLayout::USE_PREF, 0, 0); |
118 | 118 |
119 layout->StartRow(0, column_set_id); | 119 layout->StartRow(0, column_set_id); |
120 string16 text = l10n_util::GetStringFUTF16( | 120 string16 text = l10n_util::GetStringFUTF16( |
121 IDS_CLIENT_CERT_DIALOG_TEXT, | 121 IDS_CLIENT_CERT_DIALOG_TEXT, |
122 ASCIIToUTF16(cert_request_info()->host_and_port)); | 122 ASCIIToUTF16(cert_request_info()->host_and_port)); |
123 views::Label* label = new views::Label(text); | 123 views::Label* label = new views::Label(text); |
124 label->SetMultiLine(true); | 124 label->SetMultiLine(true); |
125 label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 125 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
126 label->SetAllowCharacterBreak(true); | 126 label->SetAllowCharacterBreak(true); |
127 layout->AddView(label); | 127 layout->AddView(label); |
128 | 128 |
129 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); | 129 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
130 | 130 |
131 CreateCertTable(); | 131 CreateCertTable(); |
132 layout->StartRow(1, column_set_id); | 132 layout->StartRow(1, column_set_id); |
133 layout->AddView(table_->CreateParentIfNecessary(), 1, 1, | 133 layout->AddView(table_->CreateParentIfNecessary(), 1, 1, |
134 views::GridLayout::FILL, | 134 views::GridLayout::FILL, |
135 views::GridLayout::FILL, kTableViewWidth, kTableViewHeight); | 135 views::GridLayout::FILL, kTableViewWidth, kTableViewHeight); |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 net::SSLCertRequestInfo* cert_request_info, | 289 net::SSLCertRequestInfo* cert_request_info, |
290 const base::Callback<void(net::X509Certificate*)>& callback) { | 290 const base::Callback<void(net::X509Certificate*)>& callback) { |
291 DVLOG(1) << __FUNCTION__ << " " << contents; | 291 DVLOG(1) << __FUNCTION__ << " " << contents; |
292 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 292 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
293 TabContents* tab_contents = TabContents::FromWebContents(contents); | 293 TabContents* tab_contents = TabContents::FromWebContents(contents); |
294 (new SSLClientCertificateSelector( | 294 (new SSLClientCertificateSelector( |
295 tab_contents, network_session, cert_request_info, callback))->Init(); | 295 tab_contents, network_session, cert_request_info, callback))->Init(); |
296 } | 296 } |
297 | 297 |
298 } // namespace chrome | 298 } // namespace chrome |
OLD | NEW |