OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1394 security_info.cert_id)); | 1394 security_info.cert_id)); |
1395 } | 1395 } |
1396 } | 1396 } |
1397 | 1397 |
1398 if (security_info.is_secure_protocol_and_ciphersuite) { | 1398 if (security_info.is_secure_protocol_and_ciphersuite) { |
1399 security_style_explanations->secure_explanations.push_back( | 1399 security_style_explanations->secure_explanations.push_back( |
1400 content::SecurityStyleExplanation( | 1400 content::SecurityStyleExplanation( |
1401 l10n_util::GetStringUTF8(IDS_SECURE_PROTOCOL_AND_CIPHERSUITE), | 1401 l10n_util::GetStringUTF8(IDS_SECURE_PROTOCOL_AND_CIPHERSUITE), |
1402 l10n_util::GetStringUTF8( | 1402 l10n_util::GetStringUTF8( |
1403 IDS_SECURE_PROTOCOL_AND_CIPHERSUITE_DESCRIPTION))); | 1403 IDS_SECURE_PROTOCOL_AND_CIPHERSUITE_DESCRIPTION))); |
1404 } else { | |
1405 // TODO: Include cipher suite name | |
1406 security_style_explanations->info_explanations.push_back( | |
1407 content::SecurityStyleExplanation( | |
1408 l10n_util::GetStringUTF8(IDS_OBSOLETE_PROTOCOL_AND_CIPHERSUITE), | |
1409 l10n_util::GetStringUTF8( | |
1410 IDS_OBSOLETE_PROTOCOL_AND_CIPHERSUITE_DESCRIPTION)) | |
1411 ); | |
estark
2016/02/24 02:10:50
formatting looks weird here
lgarron
2016/04/09 03:22:50
The last I've moved the final ); onto the previous
| |
1404 } | 1412 } |
1405 | 1413 |
1406 return security_style; | 1414 return security_style; |
1407 } | 1415 } |
1408 | 1416 |
1409 void Browser::ShowCertificateViewerInDevTools( | 1417 void Browser::ShowCertificateViewerInDevTools( |
1410 content::WebContents* web_contents, int cert_id) { | 1418 content::WebContents* web_contents, int cert_id) { |
1411 DevToolsWindow* devtools_window = | 1419 DevToolsWindow* devtools_window = |
1412 DevToolsWindow::GetInstanceForInspectedWebContents(web_contents); | 1420 DevToolsWindow::GetInstanceForInspectedWebContents(web_contents); |
1413 if (devtools_window) | 1421 if (devtools_window) |
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2732 if (contents && !allow_js_access) { | 2740 if (contents && !allow_js_access) { |
2733 contents->web_contents()->GetController().LoadURL( | 2741 contents->web_contents()->GetController().LoadURL( |
2734 target_url, | 2742 target_url, |
2735 content::Referrer(), | 2743 content::Referrer(), |
2736 ui::PAGE_TRANSITION_LINK, | 2744 ui::PAGE_TRANSITION_LINK, |
2737 std::string()); // No extra headers. | 2745 std::string()); // No extra headers. |
2738 } | 2746 } |
2739 | 2747 |
2740 return contents != NULL; | 2748 return contents != NULL; |
2741 } | 2749 } |
OLD | NEW |