Chromium Code Reviews| Index: chrome/renderer/extensions/user_script_scheduler.cc |
| diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc |
| index d4b77d1aa96a50e98bd099763cd3e79296ef9792..1b303066e6e6e900cd40581c73c688b0ee5ff076 100644 |
| --- a/chrome/renderer/extensions/user_script_scheduler.cc |
| +++ b/chrome/renderer/extensions/user_script_scheduler.cc |
| @@ -7,6 +7,7 @@ |
| #include "base/bind.h" |
| #include "base/logging.h" |
| #include "base/message_loop/message_loop.h" |
| +#include "chrome/common/url_constants.h" |
| #include "chrome/renderer/chrome_render_process_observer.h" |
| #include "chrome/renderer/extensions/chrome_v8_context.h" |
| #include "chrome/renderer/extensions/dispatcher.h" |
| @@ -184,21 +185,31 @@ void UserScriptScheduler::ExecuteCodeImpl( |
| // |
| // For child frames, we just skip ones the extension doesn't have access |
| // to and carry on. |
| - if (!params.is_web_view && |
| - !PermissionsData::CanExecuteScriptOnPage(extension, |
| - child_frame->document().url(), |
| - frame_->document().url(), |
| - extension_helper->tab_id(), |
| - NULL, |
| - -1, |
| - NULL)) { |
| - if (child_frame->parent()) { |
| - continue; |
| - } else { |
| - error = ErrorUtils::FormatErrorMessage( |
| - manifest_errors::kCannotAccessPage, |
| - child_frame->document().url().spec()); |
| - break; |
| + if (!params.is_web_view) { |
| + GURL document_url(child_frame->document().url()); |
| + |
| + if (document_url.SchemeIs(content::kAboutScheme)) { |
|
not at google - send to devlin
2014/04/18 16:04:55
mention that about: URLs inherit the origin from t
|
| + GURL document_origin_url( |
| + child_frame->document().securityOrigin().toString()); |
| + if (document_origin_url.is_valid()) |
| + document_url = document_origin_url; |
| + } |
| + |
| + if (!PermissionsData::CanExecuteScriptOnPage(extension, |
| + document_url, |
| + frame_->document().url(), |
| + extension_helper->tab_id(), |
| + NULL, |
| + -1, |
| + NULL)) { |
| + if (child_frame->parent()) { |
| + continue; |
| + } else { |
| + error = ErrorUtils::FormatErrorMessage( |
| + manifest_errors::kCannotAccessPage, |
| + child_frame->document().url().spec()); |
|
not at google - send to devlin
2014/04/18 16:04:55
use document_url here.
|
| + break; |
| + } |
| } |
| } |