Chromium Code Reviews| Index: chrome/browser/extensions/extension_protocols.cc |
| diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc |
| index 25ef06bdc056216995db854943831e6a3db565fc..5c444982d929cb625367234a43bfa3ad4968b6f1 100644 |
| --- a/chrome/browser/extensions/extension_protocols.cc |
| +++ b/chrome/browser/extensions/extension_protocols.cc |
| @@ -23,6 +23,7 @@ |
| #include "base/threading/thread_restrictions.h" |
| #include "build/build_config.h" |
| #include "chrome/browser/extensions/extension_info_map.h" |
| +#include "chrome/browser/extensions/extension_renderer_state.h" |
| #include "chrome/browser/extensions/image_loader.h" |
| #include "chrome/common/chrome_paths.h" |
| #include "chrome/common/extensions/background_info.h" |
| @@ -34,6 +35,7 @@ |
| #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" |
| #include "chrome/common/extensions/manifest_url_handler.h" |
| #include "chrome/common/extensions/web_accessible_resources_handler.h" |
| +#include "chrome/common/extensions/webview_accessible_resources_handler.h" |
| #include "chrome/common/url_constants.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/resource_request_info.h" |
| @@ -338,6 +340,19 @@ bool AllowExtensionResourceLoad(net::URLRequest* request, |
| return true; |
| } |
| + ExtensionRendererState* renderer_state = |
|
Matt Perry
2013/09/24 21:06:54
Is there a reason you put this check here are the
Matt Perry
2013/09/24 23:09:29
ping
Fady Samuel
2013/09/24 23:35:15
Oops. I'm not sure how I missed this. It seems con
|
| + ExtensionRendererState::GetInstance(); |
| + ExtensionRendererState::WebViewInfo webview_info; |
| + bool is_guest = renderer_state->GetWebViewInfo(info->GetChildID(), |
| + info->GetRouteID(), |
| + &webview_info); |
| + std::string resource_path = request->url().path(); |
| + if (is_guest && |
| + extensions::WebviewAccessibleResourcesInfo::IsResourceWebviewAccessible( |
| + extension, webview_info.partition_id, resource_path)) { |
| + return true; |
| + } |
| + |
| if (is_incognito && !ExtensionCanLoadInIncognito(info, request->url().host(), |
| extension_info_map)) { |
| return false; |