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

Unified Diff: chrome/renderer/render_view.cc

Issue 262002: Make all content scripts from an extension run in the same (Closed)
Patch Set: Created 11 years, 2 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 | « chrome/browser/extensions/isolated_world_apitest.cc ('k') | chrome/renderer/user_script_slave.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 6888fbb72d18e4b408bcd8adebf444b382260516..58a141c4f1c5bb0190093f83f9f46a11c5d1e3f4 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3594,8 +3594,9 @@ void RenderView::OnExecuteCode(int request_id, const std::string& extension_id,
sources.push_back(
WebScriptSource(WebString::fromUTF8(code_string)));
UserScriptSlave::InsertInitExtensionCode(&sources, extension_id);
- main_frame->executeScriptInNewWorld(&sources.front(), sources.size(),
- EXTENSION_GROUP_CONTENT_SCRIPTS);
+ main_frame->executeScriptInIsolatedWorld(
+ UserScriptSlave::GetIsolatedWorldId(extension_id),
+ &sources.front(), sources.size(), EXTENSION_GROUP_CONTENT_SCRIPTS);
} else {
main_frame->insertStyleText(WebString::fromUTF8(code_string), WebString());
}
« no previous file with comments | « chrome/browser/extensions/isolated_world_apitest.cc ('k') | chrome/renderer/user_script_slave.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698