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

Unified Diff: extensions/browser/url_request_util.h

Issue 573843002: Allows webview to access extension resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix problems with early returns. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/url_request_util.h
diff --git a/chrome/browser/extensions/url_request_util.h b/extensions/browser/url_request_util.h
similarity index 50%
copy from chrome/browser/extensions/url_request_util.h
copy to extensions/browser/url_request_util.h
index 99d21773c97d0b638ed32a1d29b7fe1cac369343..20ab7dc0f2f90264f531d8c8b2a4d5c523dc8620 100644
--- a/chrome/browser/extensions/url_request_util.h
+++ b/extensions/browser/url_request_util.h
@@ -2,19 +2,11 @@
// 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_
-
-#include <string>
-
-namespace base {
-class FilePath;
-}
+#ifndef EXTENSIONS_BROWSER_URL_REQUEST_UTIL_H_
+#define EXTENSIONS_BROWSER_URL_REQUEST_UTIL_H_
namespace net {
-class NetworkDelegate;
class URLRequest;
-class URLRequestJob;
}
namespace extensions {
@@ -25,22 +17,14 @@ class InfoMap;
// chrome/browser/extensions/extension_protocols_unittest.cc for related tests.
namespace 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);
-
-// Creates a URLRequestJob for loading component extension resources out of
-// a Chrome resource bundle. Returns NULL if the requested resource is not a
-// component extension resource.
-net::URLRequestJob* MaybeCreateURLRequestResourceBundleJob(
- net::URLRequest* request,
- net::NetworkDelegate* network_delegate,
- const base::FilePath& directory_path,
- const std::string& content_security_policy,
- bool send_cors_header);
+ InfoMap* extension_info_map,
+ bool* allowed);
// Returns true if |request| corresponds to a resource request from a
// <webview>.
@@ -49,4 +33,4 @@ bool IsWebViewRequest(net::URLRequest* request);
} // namespace url_request_util
} // namespace extensions
-#endif // CHROME_BROWSER_EXTENSIONS_URL_REQUEST_UTIL_H_
+#endif // EXTENSIONS_BROWSER_URL_REQUEST_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698