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..5152d1388f7227f9a6c281aafaf9c795c0c59fca 100644 |
--- a/chrome/renderer/extensions/user_script_scheduler.cc |
+++ b/chrome/renderer/extensions/user_script_scheduler.cc |
@@ -184,21 +184,24 @@ 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 = UserScriptSlave::GetEffectiveDocumentURL( |
+ child_frame, child_frame->document().url(), params.match_about_blank); |
+ |
+ 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, document_url.spec()); |
+ break; |
+ } |
} |
} |