diff options
| author | eaugusti@chromium.org <eaugusti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-13 19:00:24 +0000 |
|---|---|---|
| committer | eaugusti@chromium.org <eaugusti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-13 19:00:24 +0000 |
| commit | e7d6ec8594d224d2967de6edc94ddbd58419f218 (patch) | |
| tree | e3b294198b1b56f6d0133888a8aa5712a14eb094 /chrome/browser/chromeos/accessibility | |
| parent | 009266504f0b83aa61cbf91c4ed29c429f7674c2 (diff) | |
| download | chromium_src-e7d6ec8594d224d2967de6edc94ddbd58419f218.zip chromium_src-e7d6ec8594d224d2967de6edc94ddbd58419f218.tar.gz chromium_src-e7d6ec8594d224d2967de6edc94ddbd58419f218.tar.bz2 | |
Adding run_at to chrome.tabs.executeScript/insertCss.
As per Aaron's suggestion I extended the functionality of
UserScriptIdleScheduler to run different scripts at different times depending
on when the script requested to be run.
chrome.tabs.executeScript/insertCss now accept a 'runAt' parameter that follows
the semantics specified here: http://code.google.com/chrome/extensions/content_scripts.html
The script will be injected as earliest as the 'runAt' parameter.
So I guess it is now more of a UserScriptScheduler.
BUG=107286
Review URL: http://codereview.chromium.org/9456037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/accessibility')
| -rw-r--r-- | chrome/browser/chromeos/accessibility/accessibility_util.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc index 3207321..7ff99f2 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_util.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc @@ -17,6 +17,7 @@ #include "chrome/browser/speech/extension_api/tts_extension_api_platform.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_resource.h" +#include "chrome/common/extensions/user_script.h" #include "chrome/common/pref_names.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" @@ -71,6 +72,7 @@ class ContentScriptLoader { params.extension_id = extension_id_; params.is_javascript = true; params.code = data; + params.run_at = UserScript::DOCUMENT_IDLE; params.all_frames = true; params.in_main_world = false; render_view_host_->Send(new ExtensionMsg_ExecuteCode( @@ -110,7 +112,7 @@ void EnableSpokenFeedback(bool enabled, content::WebUI* login_web_ui) { profile->GetExtensionService(); FilePath path = FilePath(extension_misc::kAccessExtensionPath) .AppendASCII(extension_misc::kChromeVoxDirectoryName); - if (enabled) { // Load ChromeVox + if (enabled) { // Load ChromeVox const Extension* extension = extension_service->component_loader()->Add(IDR_CHROMEVOX_MANIFEST, path); @@ -125,6 +127,7 @@ void EnableSpokenFeedback(bool enabled, content::WebUI* login_web_ui) { params.extension_id = extension->id(); params.is_javascript = true; params.code = "window.INJECTED_AFTER_LOAD = true;"; + params.run_at = UserScript::DOCUMENT_IDLE; params.all_frames = true; params.in_main_world = false; render_view_host->Send(new ExtensionMsg_ExecuteCode( @@ -147,7 +150,7 @@ void EnableSpokenFeedback(bool enabled, content::WebUI* login_web_ui) { } DLOG(INFO) << "ChromeVox was Loaded."; - } else { // Unload ChromeVox + } else { // Unload ChromeVox extension_service->component_loader()->Remove(path); DLOG(INFO) << "ChromeVox was Unloaded."; } |