Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2182633007: Avoid using ContentBrowserClient::IsIllegalOrigin in ResourceDispatcherHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the IsIllegalOrigin function from ContentBrowserClient Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 content::RenderProcessHost* process_host, 1127 content::RenderProcessHost* process_host,
1128 const GURL& url) { 1128 const GURL& url) {
1129 #if defined(ENABLE_EXTENSIONS) 1129 #if defined(ENABLE_EXTENSIONS)
1130 return ChromeContentBrowserClientExtensionsPart::CanCommitURL( 1130 return ChromeContentBrowserClientExtensionsPart::CanCommitURL(
1131 process_host, url); 1131 process_host, url);
1132 #else 1132 #else
1133 return true; 1133 return true;
1134 #endif 1134 #endif
1135 } 1135 }
1136 1136
1137 bool ChromeContentBrowserClient::IsIllegalOrigin(
1138 content::ResourceContext* resource_context,
1139 int child_process_id,
1140 const GURL& origin) {
1141 #if defined(ENABLE_EXTENSIONS)
1142 return ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin(
1143 resource_context, child_process_id, origin);
1144 #else
1145 return false;
1146 #endif
1147 }
1148
1149 bool ChromeContentBrowserClient::ShouldAllowOpenURL( 1137 bool ChromeContentBrowserClient::ShouldAllowOpenURL(
1150 content::SiteInstance* site_instance, const GURL& url) { 1138 content::SiteInstance* site_instance, const GURL& url) {
1151 GURL from_url = site_instance->GetSiteURL(); 1139 GURL from_url = site_instance->GetSiteURL();
1152 1140
1153 #if defined(ENABLE_EXTENSIONS) 1141 #if defined(ENABLE_EXTENSIONS)
1154 bool result; 1142 bool result;
1155 if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL( 1143 if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
1156 site_instance, from_url, url, &result)) 1144 site_instance, from_url, url, &result))
1157 return result; 1145 return result;
1158 #endif 1146 #endif
(...skipping 1890 matching lines...) Expand 10 before | Expand all | Expand 10 after
3049 if (channel <= kMaxDisableEncryptionChannel) { 3037 if (channel <= kMaxDisableEncryptionChannel) {
3050 static const char* const kWebRtcDevSwitchNames[] = { 3038 static const char* const kWebRtcDevSwitchNames[] = {
3051 switches::kDisableWebRtcEncryption, 3039 switches::kDisableWebRtcEncryption,
3052 }; 3040 };
3053 to_command_line->CopySwitchesFrom(from_command_line, 3041 to_command_line->CopySwitchesFrom(from_command_line,
3054 kWebRtcDevSwitchNames, 3042 kWebRtcDevSwitchNames,
3055 arraysize(kWebRtcDevSwitchNames)); 3043 arraysize(kWebRtcDevSwitchNames));
3056 } 3044 }
3057 } 3045 }
3058 #endif // defined(ENABLE_WEBRTC) 3046 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698