| 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/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 Loading... |
| 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 1714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1787 // Otherwise, display an SSL blocking page. The interstitial page takes | 1788 // Otherwise, display an SSL blocking page. The interstitial page takes |
| 1788 // ownership of ssl_blocking_page. | 1789 // ownership of ssl_blocking_page. |
| 1789 int options_mask = 0; | 1790 int options_mask = 0; |
| 1790 if (overridable) | 1791 if (overridable) |
| 1791 options_mask |= SSLBlockingPage::OVERRIDABLE; | 1792 options_mask |= SSLBlockingPage::OVERRIDABLE; |
| 1792 if (strict_enforcement) | 1793 if (strict_enforcement) |
| 1793 options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT; | 1794 options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT; |
| 1794 if (expired_previous_decision) | 1795 if (expired_previous_decision) |
| 1795 options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED; | 1796 options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED; |
| 1796 | 1797 |
| 1798 SafeBrowsingService* safe_browsing_service = |
| 1799 g_browser_process->safe_browsing_service(); |
| 1797 SSLErrorHandler::HandleSSLError( | 1800 SSLErrorHandler::HandleSSLError( |
| 1798 tab, cert_error, ssl_info, request_url, options_mask, callback); | 1801 tab, cert_error, ssl_info, request_url, options_mask, |
| 1802 safe_browsing_service ? safe_browsing_service->ui_manager().get() |
| 1803 : nullptr, |
| 1804 callback); |
| 1799 } | 1805 } |
| 1800 | 1806 |
| 1801 void ChromeContentBrowserClient::SelectClientCertificate( | 1807 void ChromeContentBrowserClient::SelectClientCertificate( |
| 1802 content::WebContents* web_contents, | 1808 content::WebContents* web_contents, |
| 1803 net::SSLCertRequestInfo* cert_request_info, | 1809 net::SSLCertRequestInfo* cert_request_info, |
| 1804 scoped_ptr<content::ClientCertificateDelegate> delegate) { | 1810 scoped_ptr<content::ClientCertificateDelegate> delegate) { |
| 1805 prerender::PrerenderContents* prerender_contents = | 1811 prerender::PrerenderContents* prerender_contents = |
| 1806 prerender::PrerenderContents::FromWebContents(web_contents); | 1812 prerender::PrerenderContents::FromWebContents(web_contents); |
| 1807 if (prerender_contents) { | 1813 if (prerender_contents) { |
| 1808 prerender_contents->Destroy( | 1814 prerender_contents->Destroy( |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2582 switches::kDisableWebRtcEncryption, | 2588 switches::kDisableWebRtcEncryption, |
| 2583 }; | 2589 }; |
| 2584 to_command_line->CopySwitchesFrom(from_command_line, | 2590 to_command_line->CopySwitchesFrom(from_command_line, |
| 2585 kWebRtcDevSwitchNames, | 2591 kWebRtcDevSwitchNames, |
| 2586 arraysize(kWebRtcDevSwitchNames)); | 2592 arraysize(kWebRtcDevSwitchNames)); |
| 2587 } | 2593 } |
| 2588 } | 2594 } |
| 2589 #endif // defined(ENABLE_WEBRTC) | 2595 #endif // defined(ENABLE_WEBRTC) |
| 2590 | 2596 |
| 2591 } // namespace chrome | 2597 } // namespace chrome |
| OLD | NEW |