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 05:02:30 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 05:02:30 +0000
commitfa7b6b547368d12ccd61f6cbf251f2ff0d37b504 (patch)
treec28ef0f99dc70cd1dc8acf70f3cc8af5d2cb9072 /chrome/browser/extensions
parentd12f7a9539c490b3e008d234526a67d0496972b3 (diff)
downloadchromium_src-fa7b6b547368d12ccd61f6cbf251f2ff0d37b504.zip
chromium_src-fa7b6b547368d12ccd61f6cbf251f2ff0d37b504.tar.gz
chromium_src-fa7b6b547368d12ccd61f6cbf251f2ff0d37b504.tar.bz2
Re-commit "Add new user script injection point:
document_idle." Original code review: http://codereview.chromium.org/339064 BUG=26126 TBR=rafaelw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30796 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());