| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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/search/instant_service.h" | 63 #include "chrome/browser/search/instant_service.h" |
| 64 #include "chrome/browser/search/instant_service_factory.h" | 64 #include "chrome/browser/search/instant_service_factory.h" |
| 65 #include "chrome/browser/search/search.h" | 65 #include "chrome/browser/search/search.h" |
| 66 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" | 66 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" |
| 67 #include "chrome/browser/signin/principals_message_filter.h" | |
| 68 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 67 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
| 69 #include "chrome/browser/speech/tts_controller.h" | 68 #include "chrome/browser/speech/tts_controller.h" |
| 70 #include "chrome/browser/speech/tts_message_filter.h" | 69 #include "chrome/browser/speech/tts_message_filter.h" |
| 71 #include "chrome/browser/ssl/ssl_add_certificate.h" | 70 #include "chrome/browser/ssl/ssl_add_certificate.h" |
| 72 #include "chrome/browser/ssl/ssl_blocking_page.h" | 71 #include "chrome/browser/ssl/ssl_blocking_page.h" |
| 73 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 72 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
| 74 #include "chrome/browser/ssl/ssl_error_handler.h" | 73 #include "chrome/browser/ssl/ssl_error_handler.h" |
| 75 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 74 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
| 76 #include "chrome/browser/tab_contents/tab_util.h" | 75 #include "chrome/browser/tab_contents/tab_util.h" |
| 77 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 76 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
| (...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 #endif | 935 #endif |
| 937 #if !defined(DISABLE_NACL) | 936 #if !defined(DISABLE_NACL) |
| 938 host->AddFilter(new nacl::NaClHostMessageFilter( | 937 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 939 id, profile->IsOffTheRecord(), | 938 id, profile->IsOffTheRecord(), |
| 940 profile->GetPath(), | 939 profile->GetPath(), |
| 941 context)); | 940 context)); |
| 942 #endif | 941 #endif |
| 943 #if defined(OS_ANDROID) | 942 #if defined(OS_ANDROID) |
| 944 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 943 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
| 945 #endif | 944 #endif |
| 946 if (switches::IsEnableAccountConsistency()) | |
| 947 host->AddFilter(new PrincipalsMessageFilter(id)); | |
| 948 | |
| 949 DataReductionProxyChromeSettings* data_reduction_proxy_settings = | 945 DataReductionProxyChromeSettings* data_reduction_proxy_settings = |
| 950 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); | 946 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); |
| 951 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter( | 947 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter( |
| 952 data_reduction_proxy_settings)); | 948 data_reduction_proxy_settings)); |
| 953 | 949 |
| 954 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 950 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
| 955 profile->IsOffTheRecord())); | 951 profile->IsOffTheRecord())); |
| 956 | 952 |
| 957 for (size_t i = 0; i < extra_parts_.size(); ++i) | 953 for (size_t i = 0; i < extra_parts_.size(); ++i) |
| 958 extra_parts_[i]->RenderProcessWillLaunch(host); | 954 extra_parts_[i]->RenderProcessWillLaunch(host); |
| (...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2644 switches::kDisableWebRtcEncryption, | 2640 switches::kDisableWebRtcEncryption, |
| 2645 }; | 2641 }; |
| 2646 to_command_line->CopySwitchesFrom(from_command_line, | 2642 to_command_line->CopySwitchesFrom(from_command_line, |
| 2647 kWebRtcDevSwitchNames, | 2643 kWebRtcDevSwitchNames, |
| 2648 arraysize(kWebRtcDevSwitchNames)); | 2644 arraysize(kWebRtcDevSwitchNames)); |
| 2649 } | 2645 } |
| 2650 } | 2646 } |
| 2651 #endif // defined(ENABLE_WEBRTC) | 2647 #endif // defined(ENABLE_WEBRTC) |
| 2652 | 2648 |
| 2653 } // namespace chrome | 2649 } // namespace chrome |
| OLD | NEW |