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 20 matching lines...) Expand all Loading... |
31 #include "chrome/browser/chrome_quota_permission_context.h" | 31 #include "chrome/browser/chrome_quota_permission_context.h" |
32 #include "chrome/browser/content_settings/cookie_settings.h" | 32 #include "chrome/browser/content_settings/cookie_settings.h" |
33 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 33 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
34 #include "chrome/browser/defaults.h" | 34 #include "chrome/browser/defaults.h" |
35 #include "chrome/browser/download/download_prefs.h" | 35 #include "chrome/browser/download/download_prefs.h" |
36 #include "chrome/browser/font_family_cache.h" | 36 #include "chrome/browser/font_family_cache.h" |
37 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 37 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
39 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 39 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
40 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 40 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 41 #include "chrome/browser/net/cert_logger.pb.h" |
41 #include "chrome/browser/net/chrome_net_log.h" | 42 #include "chrome/browser/net/chrome_net_log.h" |
42 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 43 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
43 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" | 44 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" |
44 #include "chrome/browser/notifications/platform_notification_service_impl.h" | 45 #include "chrome/browser/notifications/platform_notification_service_impl.h" |
45 #include "chrome/browser/platform_util.h" | 46 #include "chrome/browser/platform_util.h" |
46 #include "chrome/browser/prerender/prerender_final_status.h" | 47 #include "chrome/browser/prerender/prerender_final_status.h" |
47 #include "chrome/browser/prerender/prerender_manager.h" | 48 #include "chrome/browser/prerender/prerender_manager.h" |
48 #include "chrome/browser/prerender/prerender_manager_factory.h" | 49 #include "chrome/browser/prerender/prerender_manager_factory.h" |
49 #include "chrome/browser/prerender/prerender_message_filter.h" | 50 #include "chrome/browser/prerender/prerender_message_filter.h" |
50 #include "chrome/browser/printing/printing_message_filter.h" | 51 #include "chrome/browser/printing/printing_message_filter.h" |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 // SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid | 526 // SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid |
526 // certificate reports. | 527 // certificate reports. |
527 class SafeBrowsingSSLCertReporter : public SSLCertReporter { | 528 class SafeBrowsingSSLCertReporter : public SSLCertReporter { |
528 public: | 529 public: |
529 explicit SafeBrowsingSSLCertReporter( | 530 explicit SafeBrowsingSSLCertReporter( |
530 const scoped_refptr<SafeBrowsingUIManager>& safe_browsing_ui_manager) | 531 const scoped_refptr<SafeBrowsingUIManager>& safe_browsing_ui_manager) |
531 : safe_browsing_ui_manager_(safe_browsing_ui_manager) {} | 532 : safe_browsing_ui_manager_(safe_browsing_ui_manager) {} |
532 ~SafeBrowsingSSLCertReporter() override {} | 533 ~SafeBrowsingSSLCertReporter() override {} |
533 | 534 |
534 // SSLCertReporter implementation | 535 // SSLCertReporter implementation |
535 void ReportInvalidCertificateChain(const std::string& hostname, | 536 void SendReport( |
536 const net::SSLInfo& ssl_info) override { | 537 const chrome_browser_net::CertLoggerRequest& report) override { |
537 if (safe_browsing_ui_manager_) { | 538 if (safe_browsing_ui_manager_) { |
538 safe_browsing_ui_manager_->ReportInvalidCertificateChain( | 539 safe_browsing_ui_manager_->ReportInvalidCertificateChain( |
539 hostname, ssl_info, base::Bind(&base::DoNothing)); | 540 report, base::Bind(&base::DoNothing)); |
540 } | 541 } |
541 } | 542 } |
542 | 543 |
543 private: | 544 private: |
544 const scoped_refptr<SafeBrowsingUIManager> safe_browsing_ui_manager_; | 545 const scoped_refptr<SafeBrowsingUIManager> safe_browsing_ui_manager_; |
545 }; | 546 }; |
546 | 547 |
547 #if defined(OS_ANDROID) | 548 #if defined(OS_ANDROID) |
548 | 549 |
549 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) { | 550 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) { |
(...skipping 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2433 switches::kDisableWebRtcEncryption, | 2434 switches::kDisableWebRtcEncryption, |
2434 }; | 2435 }; |
2435 to_command_line->CopySwitchesFrom(from_command_line, | 2436 to_command_line->CopySwitchesFrom(from_command_line, |
2436 kWebRtcDevSwitchNames, | 2437 kWebRtcDevSwitchNames, |
2437 arraysize(kWebRtcDevSwitchNames)); | 2438 arraysize(kWebRtcDevSwitchNames)); |
2438 } | 2439 } |
2439 } | 2440 } |
2440 #endif // defined(ENABLE_WEBRTC) | 2441 #endif // defined(ENABLE_WEBRTC) |
2441 | 2442 |
2442 } // namespace chrome | 2443 } // namespace chrome |
OLD | NEW |