summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 01:29:39 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 01:29:39 +0000
commit5442dafd85700e323fe6c332eeec0f17de6f7891 (patch)
tree9e065d301222177c4371e0522424deb8f07ba488 /chrome/browser/extensions
parent40fc8b766191d37dbcbcb67894d233da2899821c (diff)
downloadchromium_src-5442dafd85700e323fe6c332eeec0f17de6f7891.zip
chromium_src-5442dafd85700e323fe6c332eeec0f17de6f7891.tar.gz
chromium_src-5442dafd85700e323fe6c332eeec0f17de6f7891.tar.bz2
Add new user script injection point "document_idle" and make it the default.
Semantically, document-idle means "when the DOM is ready and layout has been idle for awhile", or more loosely, "as soon as we get around to it". Right now this uses a simple heuristic. It injects scripts 200ms after DOMContentLoaded, or immediately after onload, whichever happens first. BUG=26126 TEST=Manual. Extensions with content scripts should work. Review URL: http://codereview.chromium.org/339064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/user_script_master.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index b0552e0..69fd746 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -166,6 +166,11 @@ void UserScriptMaster::ScriptReloader::LoadScriptsFromDirectory(
file = enumerator.Next()) {
result->push_back(UserScript());
UserScript& user_script = result->back();
+
+ // We default standalone user scripts to document-end for better
+ // Greasemonkey compatibility.
+ user_script.set_run_location(UserScript::DOCUMENT_END);
+
// Push single js file in this UserScript.
GURL url(std::string(chrome::kUserScriptScheme) + ":/" +
net::FilePathToFileURL(file).ExtractFileName());