| Index: chrome/browser/net/chrome_extensions_network_delegate.cc
|
| diff --git a/chrome/browser/net/chrome_extensions_network_delegate.cc b/chrome/browser/net/chrome_extensions_network_delegate.cc
|
| index dad8c7e107e8197d1efb33b63725a4f700c25002..62b41f9ade32fdaaa0be03d2ffada2ef40946996 100644
|
| --- a/chrome/browser/net/chrome_extensions_network_delegate.cc
|
| +++ b/chrome/browser/net/chrome_extensions_network_delegate.cc
|
| @@ -20,6 +20,7 @@
|
| #include "content/public/browser/resource_request_info.h"
|
| #include "extensions/browser/api/web_request/web_request_api.h"
|
| #include "extensions/browser/extension_navigation_ui_data.h"
|
| +#include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
|
| #include "extensions/browser/info_map.h"
|
| #include "extensions/browser/process_manager.h"
|
| #include "extensions/common/constants.h"
|
| @@ -185,6 +186,9 @@ int ChromeExtensionsNetworkDelegateImpl::OnBeforeURLRequest(
|
| bool is_nested_url = url.SchemeIsFileSystem() || url.SchemeIsBlob();
|
| bool is_navigation =
|
| info && content::IsResourceTypeFrame(info->GetResourceType());
|
| + extensions::ExtensionNavigationUIData* extension_data =
|
| + GetExtensionNavigationUIData(request);
|
| +
|
| url::Origin origin(url);
|
| if (is_nested_url && is_navigation && info->IsMainFrame() &&
|
| origin.scheme() == extensions::kExtensionScheme &&
|
| @@ -197,13 +201,15 @@ int ChromeExtensionsNetworkDelegateImpl::OnBeforeURLRequest(
|
| extension &&
|
| extension->permissions_data()->HasAPIPermission(
|
| extensions::APIPermission::kWebView);
|
| - if (!has_webview_permission)
|
| + if (!has_webview_permission &&
|
| + (extension_data ? !extension_data->from_extension() : true)) {
|
| return net::ERR_ABORTED;
|
| + }
|
| }
|
|
|
| return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
|
| - profile_, extension_info_map_.get(),
|
| - GetExtensionNavigationUIData(request), request, callback, new_url);
|
| + profile_, extension_info_map_.get(), extension_data, request, callback,
|
| + new_url);
|
| }
|
|
|
| int ChromeExtensionsNetworkDelegateImpl::OnBeforeStartTransaction(
|
|
|