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 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
937 #endif | 937 #endif |
938 if (switches::IsNewProfileManagement()) | 938 if (switches::IsNewProfileManagement()) |
939 host->AddFilter(new PrincipalsMessageFilter(id)); | 939 host->AddFilter(new PrincipalsMessageFilter(id)); |
940 | 940 |
941 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 941 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
942 profile->IsOffTheRecord())); | 942 profile->IsOffTheRecord())); |
943 | 943 |
944 SendExtensionWebRequestStatusToHost(host); | 944 SendExtensionWebRequestStatusToHost(host); |
945 | 945 |
946 RendererContentSettingRules rules; | 946 RendererContentSettingRules rules; |
947 if (host->IsGuest()) { | 947 if (host->IsIsolatedGuest()) { |
948 GuestViewBase::GetDefaultContentSettingRules(&rules, | 948 GuestViewBase::GetDefaultContentSettingRules(&rules, |
949 profile->IsOffTheRecord()); | 949 profile->IsOffTheRecord()); |
950 } else { | 950 } else { |
951 GetRendererContentSettingRules( | 951 GetRendererContentSettingRules( |
952 profile->GetHostContentSettingsMap(), &rules); | 952 profile->GetHostContentSettingsMap(), &rules); |
953 } | 953 } |
954 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | 954 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); |
955 } | 955 } |
956 | 956 |
957 GURL ChromeContentBrowserClient::GetEffectiveURL( | 957 GURL ChromeContentBrowserClient::GetEffectiveURL( |
(...skipping 1800 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2758 switches::kDisableWebRtcEncryption, | 2758 switches::kDisableWebRtcEncryption, |
2759 }; | 2759 }; |
2760 to_command_line->CopySwitchesFrom(from_command_line, | 2760 to_command_line->CopySwitchesFrom(from_command_line, |
2761 kWebRtcDevSwitchNames, | 2761 kWebRtcDevSwitchNames, |
2762 arraysize(kWebRtcDevSwitchNames)); | 2762 arraysize(kWebRtcDevSwitchNames)); |
2763 } | 2763 } |
2764 } | 2764 } |
2765 #endif // defined(ENABLE_WEBRTC) | 2765 #endif // defined(ENABLE_WEBRTC) |
2766 | 2766 |
2767 } // namespace chrome | 2767 } // namespace chrome |
OLD | NEW |