Commit 268056ca authored by adamk@chromium.org's avatar adamk@chromium.org

Assume extension_id can never be empty in user_script_slave.cc


Review URL: https://chromiumcodereview.appspot.com/13668002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192618 0039d316-1c4b-4281-b951-d872f2087c98
parent df40c2d9
...@@ -321,8 +321,6 @@ void UserScriptSlave::InjectScripts(WebFrame* frame, ...@@ -321,8 +321,6 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,
} }
if (!sources.empty()) { if (!sources.empty()) {
int isolated_world_id = 0;
// Emulate Greasemonkey API for scripts that were converted to extensions // Emulate Greasemonkey API for scripts that were converted to extensions
// and "standalone" user scripts. // and "standalone" user scripts.
if (script->is_standalone() || script->emulate_greasemonkey()) { if (script->is_standalone() || script->emulate_greasemonkey()) {
...@@ -330,9 +328,7 @@ void UserScriptSlave::InjectScripts(WebFrame* frame, ...@@ -330,9 +328,7 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,
WebScriptSource(WebString::fromUTF8(api_js_.as_string()))); WebScriptSource(WebString::fromUTF8(api_js_.as_string())));
} }
// TODO(aa): Can extension_id() ever be empty anymore? int isolated_world_id = GetIsolatedWorldIdForExtension(extension, frame);
if (!script->extension_id().empty())
isolated_world_id = GetIsolatedWorldIdForExtension(extension, frame);
PerfTimer exec_timer; PerfTimer exec_timer;
DOMActivityLogger::AttachToWorld( DOMActivityLogger::AttachToWorld(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment