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

Unified Diff: chrome/renderer/extensions/user_script_scheduler.cc

Issue 14651017: Move RuntimeData and related permissions out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_permissions
Patch Set: Created 7 years, 7 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
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 29650fca2fa7520cc2775cc2d4da7b7da69eb982..0cb87b1e02c3966b12e29900509e4e723a523702 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 {

Powered by Google App Engine
This is Rietveld 408576698