| Index: chrome/browser/extensions/chrome_url_request_util.h
|
| diff --git a/chrome/browser/extensions/url_request_util.h b/chrome/browser/extensions/chrome_url_request_util.h
|
| similarity index 61%
|
| copy from chrome/browser/extensions/url_request_util.h
|
| copy to chrome/browser/extensions/chrome_url_request_util.h
|
| index 99d21773c97d0b638ed32a1d29b7fe1cac369343..384538acbb28bab0d6e148cafb3cc3fd109b0450 100644
|
| --- a/chrome/browser/extensions/url_request_util.h
|
| +++ b/chrome/browser/extensions/chrome_url_request_util.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_URL_REQUEST_UTIL_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_URL_REQUEST_UTIL_H_
|
| +#ifndef CHROME_BROWSER_EXTENSIONS_CHROME_URL_REQUEST_UTIL_H_
|
| +#define CHROME_BROWSER_EXTENSIONS_CHROME_URL_REQUEST_UTIL_H_
|
|
|
| #include <string>
|
|
|
| @@ -23,14 +23,16 @@ class InfoMap;
|
|
|
| // Utilities related to URLRequest jobs for extension resources. See
|
| // chrome/browser/extensions/extension_protocols_unittest.cc for related tests.
|
| -namespace url_request_util {
|
| +namespace chrome_url_request_util {
|
|
|
| -// Returns true to allow a chrome-extension:// resource request coming from
|
| -// renderer A to access a resource in an extension running in renderer B.
|
| +// Sets allowed=true to allow a chrome-extension:// resource request coming from
|
| +// renderer A to access a resource in an extension running in renderer B.\
|
| +// Returns false when it couldn't determine if the resource is allowed or not
|
| bool AllowCrossRendererResourceLoad(net::URLRequest* request,
|
| - bool is_incognito,
|
| - const Extension* extension,
|
| - InfoMap* extension_info_map);
|
| + bool is_incognito,
|
| + const Extension* extension,
|
| + InfoMap* extension_info_map,
|
| + bool* allowed);
|
|
|
| // Creates a URLRequestJob for loading component extension resources out of
|
| // a Chrome resource bundle. Returns NULL if the requested resource is not a
|
| @@ -42,11 +44,7 @@ net::URLRequestJob* MaybeCreateURLRequestResourceBundleJob(
|
| const std::string& content_security_policy,
|
| bool send_cors_header);
|
|
|
| -// Returns true if |request| corresponds to a resource request from a
|
| -// <webview>.
|
| -bool IsWebViewRequest(net::URLRequest* request);
|
| -
|
| -} // namespace url_request_util
|
| +} // namespace chrome_url_request_util
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_URL_REQUEST_UTIL_H_
|
| +#endif // CHROME_BROWSER_EXTENSIONS_CHROME_URL_REQUEST_UTIL_H_
|
|
|