| 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 7438a370ebc1922b31b396a22deb20f4e46ecee1..132c3f004bfee1007dffd7f13c811e18c62b7277 100644
|
| --- a/chrome/renderer/extensions/user_script_scheduler.cc
|
| +++ b/chrome/renderer/extensions/user_script_scheduler.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/message_loop.h"
|
| #include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/extension_messages.h"
|
| +#include "chrome/common/extensions/permissions/permissions_data.h"
|
| #include "chrome/renderer/chrome_render_process_observer.h"
|
| #include "chrome/renderer/extensions/dispatcher.h"
|
| #include "chrome/renderer/extensions/dom_activity_logger.h"
|
| @@ -179,11 +180,13 @@ 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 &&
|
| - !extension->CanExecuteScriptOnPage(child_frame->document().url(),
|
| - frame_->document().url(),
|
| - extension_helper->tab_id(),
|
| - NULL,
|
| - NULL)) {
|
| + !PermissionsData::CanExecuteScriptOnPage(
|
| + extension,
|
| + child_frame->document().url(),
|
| + frame_->document().url(),
|
| + extension_helper->tab_id(),
|
| + NULL,
|
| + NULL)) {
|
| if (child_frame->parent()) {
|
| continue;
|
| } else {
|
|
|