| Index: chrome/renderer/extensions/extension_resource_request_policy.cc
|
| diff --git a/chrome/renderer/extensions/extension_resource_request_policy.cc b/chrome/renderer/extensions/extension_resource_request_policy.cc
|
| index 6e7e6c89a5d8efc57272a040cf5f6b4a97fb797e..4bee495a511e706bca009a2133a6132850dcdf74 100644
|
| --- a/chrome/renderer/extensions/extension_resource_request_policy.cc
|
| +++ b/chrome/renderer/extensions/extension_resource_request_policy.cc
|
| @@ -6,18 +6,21 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| +#include "base/stringprintf.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_set.h"
|
| #include "googleurl/src/gurl.h"
|
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
|
| +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
|
|
|
| // static
|
| bool ExtensionResourceRequestPolicy::CanRequestResource(
|
| const GURL& resource_url,
|
| - const WebKit::WebFrame* frame,
|
| + WebKit::WebFrame* frame,
|
| const ExtensionSet* loaded_extensions) {
|
| CHECK(resource_url.SchemeIs(chrome::kExtensionScheme));
|
|
|
| @@ -59,8 +62,14 @@ bool ExtensionResourceRequestPolicy::CanRequestResource(
|
| !(page_url.SchemeIs(chrome::kChromeDevToolsScheme) &&
|
| !extension->devtools_url().is_empty()) &&
|
| !extension->IsResourceWebAccessible(resource_url.path())) {
|
| - LOG(ERROR) << "Denying load of " << resource_url.spec() << " which "
|
| - << "is not a web accessible resource.";
|
| + std::string message = base::StringPrintf(
|
| + "Denying load of %s. Resources must be listed in the "
|
| + "web_accessible_resources manifest key in order to be loaded by web "
|
| + "pages.",
|
| + resource_url.spec().c_str());
|
| + frame->addMessageToConsole(
|
| + WebKit::WebConsoleMessage(WebKit::WebConsoleMessage::LevelError,
|
| + WebKit::WebString::fromUTF8(message)));
|
| return false;
|
| }
|
|
|
|
|