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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
982 #endif | 982 #endif |
983 #if defined(OS_ANDROID) | 983 #if defined(OS_ANDROID) |
984 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 984 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
985 #endif | 985 #endif |
986 DataReductionProxyChromeSettings* data_reduction_proxy_settings = | 986 DataReductionProxyChromeSettings* data_reduction_proxy_settings = |
987 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); | 987 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile); |
988 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter( | 988 host->AddFilter(new data_reduction_proxy::DataReductionProxyMessageFilter( |
989 data_reduction_proxy_settings)); | 989 data_reduction_proxy_settings)); |
990 host->AddFilter(new startup_metric_utils::StartupMetricMessageFilter()); | 990 host->AddFilter(new startup_metric_utils::StartupMetricMessageFilter()); |
991 | 991 |
992 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 992 host->GetImmediateSender()->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
993 profile->IsOffTheRecord())); | 993 profile->IsOffTheRecord())); |
994 | 994 |
995 for (size_t i = 0; i < extra_parts_.size(); ++i) | 995 for (size_t i = 0; i < extra_parts_.size(); ++i) |
996 extra_parts_[i]->RenderProcessWillLaunch(host); | 996 extra_parts_[i]->RenderProcessWillLaunch(host); |
997 | 997 |
998 RendererContentSettingRules rules; | 998 RendererContentSettingRules rules; |
999 if (host->IsForGuestsOnly()) { | 999 if (host->IsForGuestsOnly()) { |
1000 #if defined(ENABLE_EXTENSIONS) | 1000 #if defined(ENABLE_EXTENSIONS) |
1001 GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules); | 1001 GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules); |
1002 #else | 1002 #else |
1003 NOTREACHED(); | 1003 NOTREACHED(); |
1004 #endif | 1004 #endif |
1005 } else { | 1005 } else { |
1006 GetRendererContentSettingRules( | 1006 GetRendererContentSettingRules( |
1007 HostContentSettingsMapFactory::GetForProfile(profile), &rules); | 1007 HostContentSettingsMapFactory::GetForProfile(profile), &rules); |
1008 } | 1008 } |
1009 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | 1009 host->GetImmediateSender()->Send( |
| 1010 new ChromeViewMsg_SetContentSettingRules(rules)); |
1010 } | 1011 } |
1011 | 1012 |
1012 GURL ChromeContentBrowserClient::GetEffectiveURL( | 1013 GURL ChromeContentBrowserClient::GetEffectiveURL( |
1013 content::BrowserContext* browser_context, const GURL& url) { | 1014 content::BrowserContext* browser_context, const GURL& url) { |
1014 Profile* profile = Profile::FromBrowserContext(browser_context); | 1015 Profile* profile = Profile::FromBrowserContext(browser_context); |
1015 if (!profile) | 1016 if (!profile) |
1016 return url; | 1017 return url; |
1017 | 1018 |
1018 // If the input |url| should be assigned to the Instant renderer, make its | 1019 // If the input |url| should be assigned to the Instant renderer, make its |
1019 // effective URL distinct from other URLs on the search provider's domain. | 1020 // effective URL distinct from other URLs on the search provider's domain. |
(...skipping 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2987 if (channel <= kMaxDisableEncryptionChannel) { | 2988 if (channel <= kMaxDisableEncryptionChannel) { |
2988 static const char* const kWebRtcDevSwitchNames[] = { | 2989 static const char* const kWebRtcDevSwitchNames[] = { |
2989 switches::kDisableWebRtcEncryption, | 2990 switches::kDisableWebRtcEncryption, |
2990 }; | 2991 }; |
2991 to_command_line->CopySwitchesFrom(from_command_line, | 2992 to_command_line->CopySwitchesFrom(from_command_line, |
2992 kWebRtcDevSwitchNames, | 2993 kWebRtcDevSwitchNames, |
2993 arraysize(kWebRtcDevSwitchNames)); | 2994 arraysize(kWebRtcDevSwitchNames)); |
2994 } | 2995 } |
2995 } | 2996 } |
2996 #endif // defined(ENABLE_WEBRTC) | 2997 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |