| 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 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 content::RenderProcessHost* process_host, | 986 content::RenderProcessHost* process_host, |
| 987 const GURL& url) { | 987 const GURL& url) { |
| 988 #if defined(ENABLE_EXTENSIONS) | 988 #if defined(ENABLE_EXTENSIONS) |
| 989 return ChromeContentBrowserClientExtensionsPart::CanCommitURL( | 989 return ChromeContentBrowserClientExtensionsPart::CanCommitURL( |
| 990 process_host, url); | 990 process_host, url); |
| 991 #else | 991 #else |
| 992 return true; | 992 return true; |
| 993 #endif | 993 #endif |
| 994 } | 994 } |
| 995 | 995 |
| 996 bool ChromeContentBrowserClient::IsIllegalOrigin( |
| 997 content::ResourceContext* resource_context, |
| 998 int child_process_id, |
| 999 const GURL& origin) { |
| 1000 #if defined(ENABLE_EXTENSIONS) |
| 1001 return ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin( |
| 1002 resource_context, child_process_id, origin); |
| 1003 #else |
| 1004 return false; |
| 1005 #endif |
| 1006 } |
| 1007 |
| 996 bool ChromeContentBrowserClient::ShouldAllowOpenURL( | 1008 bool ChromeContentBrowserClient::ShouldAllowOpenURL( |
| 997 content::SiteInstance* site_instance, const GURL& url) { | 1009 content::SiteInstance* site_instance, const GURL& url) { |
| 998 GURL from_url = site_instance->GetSiteURL(); | 1010 GURL from_url = site_instance->GetSiteURL(); |
| 999 | 1011 |
| 1000 #if defined(ENABLE_EXTENSIONS) | 1012 #if defined(ENABLE_EXTENSIONS) |
| 1001 bool result; | 1013 bool result; |
| 1002 if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL( | 1014 if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL( |
| 1003 site_instance, from_url, url, &result)) | 1015 site_instance, from_url, url, &result)) |
| 1004 return result; | 1016 return result; |
| 1005 #endif | 1017 #endif |
| (...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2566 switches::kDisableWebRtcEncryption, | 2578 switches::kDisableWebRtcEncryption, |
| 2567 }; | 2579 }; |
| 2568 to_command_line->CopySwitchesFrom(from_command_line, | 2580 to_command_line->CopySwitchesFrom(from_command_line, |
| 2569 kWebRtcDevSwitchNames, | 2581 kWebRtcDevSwitchNames, |
| 2570 arraysize(kWebRtcDevSwitchNames)); | 2582 arraysize(kWebRtcDevSwitchNames)); |
| 2571 } | 2583 } |
| 2572 } | 2584 } |
| 2573 #endif // defined(ENABLE_WEBRTC) | 2585 #endif // defined(ENABLE_WEBRTC) |
| 2574 | 2586 |
| 2575 } // namespace chrome | 2587 } // namespace chrome |
| OLD | NEW |