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

Unified Diff: extensions/renderer/programmatic_script_injector.cc

Issue 945743003: Improve error message for failing code insertion on about:-URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add origin to error message Created 5 years, 10 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
« no previous file with comments | « extensions/renderer/programmatic_script_injector.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/programmatic_script_injector.cc
diff --git a/extensions/renderer/programmatic_script_injector.cc b/extensions/renderer/programmatic_script_injector.cc
index f393f9e213a299cf1244d467752264942bd426a6..86c89637be399ef9e31bcd3100a1645a710d3dc6 100644
--- a/extensions/renderer/programmatic_script_injector.cc
+++ b/extensions/renderer/programmatic_script_injector.cc
@@ -7,6 +7,7 @@
#include <vector>
#include "base/values.h"
+#include "content/public/common/url_constants.h"
#include "content/public/renderer/render_view.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/extension_messages.h"
@@ -29,6 +30,8 @@ ProgrammaticScriptInjector::ProgrammaticScriptInjector(
render_view_(content::RenderView::FromWebView(web_frame->view())),
results_(new base::ListValue()),
finished_(false) {
+ effective_url_ = ScriptContext::GetEffectiveDocumentURL(
+ web_frame, url_, params.match_about_blank);
}
ProgrammaticScriptInjector::~ProgrammaticScriptInjector() {
@@ -118,8 +121,14 @@ void ProgrammaticScriptInjector::OnWillNotInject(InjectFailureReason reason) {
std::string error;
switch (reason) {
case NOT_ALLOWED:
- error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage,
- url_.spec());
+ if (url_.SchemeIs(url::kAboutScheme)) {
+ error = ErrorUtils::FormatErrorMessage(
+ manifest_errors::kCannotAccessAboutUrl, url_.spec(),
+ effective_url_.GetOrigin().spec());
+ } else {
+ error = ErrorUtils::FormatErrorMessage(
+ manifest_errors::kCannotAccessPage, url_.spec());
+ }
break;
case EXTENSION_REMOVED: // no special error here.
case WONT_INJECT:
« no previous file with comments | « extensions/renderer/programmatic_script_injector.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698