| 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 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 890 #endif | 890 #endif |
| 891 #if !defined(DISABLE_NACL) | 891 #if !defined(DISABLE_NACL) |
| 892 host->AddFilter(new nacl::NaClHostMessageFilter( | 892 host->AddFilter(new nacl::NaClHostMessageFilter( |
| 893 id, profile->IsOffTheRecord(), | 893 id, profile->IsOffTheRecord(), |
| 894 profile->GetPath(), | 894 profile->GetPath(), |
| 895 context)); | 895 context)); |
| 896 #endif | 896 #endif |
| 897 #if defined(OS_ANDROID) | 897 #if defined(OS_ANDROID) |
| 898 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 898 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
| 899 #endif | 899 #endif |
| 900 if (switches::IsNewProfileManagement()) | 900 if (switches::IsEnableAccountConsistency()) |
| 901 host->AddFilter(new PrincipalsMessageFilter(id)); | 901 host->AddFilter(new PrincipalsMessageFilter(id)); |
| 902 | 902 |
| 903 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 903 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
| 904 profile->IsOffTheRecord())); | 904 profile->IsOffTheRecord())); |
| 905 | 905 |
| 906 #if defined(ENABLE_EXTENSIONS) | 906 #if defined(ENABLE_EXTENSIONS) |
| 907 SendExtensionWebRequestStatusToHost(host); | 907 SendExtensionWebRequestStatusToHost(host); |
| 908 #endif | 908 #endif |
| 909 | 909 |
| 910 RendererContentSettingRules rules; | 910 RendererContentSettingRules rules; |
| (...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2929 switches::kDisableWebRtcEncryption, | 2929 switches::kDisableWebRtcEncryption, |
| 2930 }; | 2930 }; |
| 2931 to_command_line->CopySwitchesFrom(from_command_line, | 2931 to_command_line->CopySwitchesFrom(from_command_line, |
| 2932 kWebRtcDevSwitchNames, | 2932 kWebRtcDevSwitchNames, |
| 2933 arraysize(kWebRtcDevSwitchNames)); | 2933 arraysize(kWebRtcDevSwitchNames)); |
| 2934 } | 2934 } |
| 2935 } | 2935 } |
| 2936 #endif // defined(ENABLE_WEBRTC) | 2936 #endif // defined(ENABLE_WEBRTC) |
| 2937 | 2937 |
| 2938 } // namespace chrome | 2938 } // namespace chrome |
| OLD | NEW |