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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 935663004: Add checkbox for reporting invalid TLS/SSL cert chains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up leftover upload url declaration Created 5 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 (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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/browser/prerender/prerender_manager_factory.h" 53 #include "chrome/browser/prerender/prerender_manager_factory.h"
54 #include "chrome/browser/prerender/prerender_message_filter.h" 54 #include "chrome/browser/prerender/prerender_message_filter.h"
55 #include "chrome/browser/printing/printing_message_filter.h" 55 #include "chrome/browser/printing/printing_message_filter.h"
56 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 56 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
57 #include "chrome/browser/profiles/profile.h" 57 #include "chrome/browser/profiles/profile.h"
58 #include "chrome/browser/profiles/profile_io_data.h" 58 #include "chrome/browser/profiles/profile_io_data.h"
59 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" 59 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
60 #include "chrome/browser/push_messaging/push_messaging_permission_context_factor y.h" 60 #include "chrome/browser/push_messaging/push_messaging_permission_context_factor y.h"
61 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 61 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
62 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 62 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
63 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
63 #include "chrome/browser/search/instant_service.h" 64 #include "chrome/browser/search/instant_service.h"
64 #include "chrome/browser/search/instant_service_factory.h" 65 #include "chrome/browser/search/instant_service_factory.h"
65 #include "chrome/browser/search/search.h" 66 #include "chrome/browser/search/search.h"
66 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 67 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
67 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 68 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
68 #include "chrome/browser/speech/tts_controller.h" 69 #include "chrome/browser/speech/tts_controller.h"
69 #include "chrome/browser/speech/tts_message_filter.h" 70 #include "chrome/browser/speech/tts_message_filter.h"
70 #include "chrome/browser/ssl/ssl_add_certificate.h" 71 #include "chrome/browser/ssl/ssl_add_certificate.h"
71 #include "chrome/browser/ssl/ssl_blocking_page.h" 72 #include "chrome/browser/ssl/ssl_blocking_page.h"
72 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 73 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
(...skipping 1705 matching lines...) Expand 10 before | Expand all | Expand 10 after
1778 // Otherwise, display an SSL blocking page. The interstitial page takes 1779 // Otherwise, display an SSL blocking page. The interstitial page takes
1779 // ownership of ssl_blocking_page. 1780 // ownership of ssl_blocking_page.
1780 int options_mask = 0; 1781 int options_mask = 0;
1781 if (overridable) 1782 if (overridable)
1782 options_mask |= SSLBlockingPage::OVERRIDABLE; 1783 options_mask |= SSLBlockingPage::OVERRIDABLE;
1783 if (strict_enforcement) 1784 if (strict_enforcement)
1784 options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT; 1785 options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT;
1785 if (expired_previous_decision) 1786 if (expired_previous_decision)
1786 options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED; 1787 options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
1787 1788
1789 SafeBrowsingService* safe_browsing_service =
1790 g_browser_process->safe_browsing_service();
1788 SSLErrorHandler::HandleSSLError( 1791 SSLErrorHandler::HandleSSLError(
1789 tab, cert_error, ssl_info, request_url, options_mask, callback); 1792 tab, cert_error, ssl_info, request_url, options_mask,
1793 safe_browsing_service ? safe_browsing_service->ui_manager().get()
1794 : nullptr,
1795 callback);
1790 } 1796 }
1791 1797
1792 void ChromeContentBrowserClient::SelectClientCertificate( 1798 void ChromeContentBrowserClient::SelectClientCertificate(
1793 content::WebContents* web_contents, 1799 content::WebContents* web_contents,
1794 net::SSLCertRequestInfo* cert_request_info, 1800 net::SSLCertRequestInfo* cert_request_info,
1795 scoped_ptr<content::ClientCertificateDelegate> delegate) { 1801 scoped_ptr<content::ClientCertificateDelegate> delegate) {
1796 prerender::PrerenderContents* prerender_contents = 1802 prerender::PrerenderContents* prerender_contents =
1797 prerender::PrerenderContents::FromWebContents(web_contents); 1803 prerender::PrerenderContents::FromWebContents(web_contents);
1798 if (prerender_contents) { 1804 if (prerender_contents) {
1799 prerender_contents->Destroy( 1805 prerender_contents->Destroy(
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
2573 switches::kDisableWebRtcEncryption, 2579 switches::kDisableWebRtcEncryption,
2574 }; 2580 };
2575 to_command_line->CopySwitchesFrom(from_command_line, 2581 to_command_line->CopySwitchesFrom(from_command_line,
2576 kWebRtcDevSwitchNames, 2582 kWebRtcDevSwitchNames,
2577 arraysize(kWebRtcDevSwitchNames)); 2583 arraysize(kWebRtcDevSwitchNames));
2578 } 2584 }
2579 } 2585 }
2580 #endif // defined(ENABLE_WEBRTC) 2586 #endif // defined(ENABLE_WEBRTC)
2581 2587
2582 } // namespace chrome 2588 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698