diff options
| author | dmazzoni <dmazzoni@chromium.org> | 2015-05-15 13:59:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-15 21:00:14 +0000 |
| commit | 0eee9bb6ceb5f90f051ede8665fd05319328b54d (patch) | |
| tree | 43e2b44d12b9a058b3d407b199a4b4726648fabd /extensions/renderer/user_script_set_manager.cc | |
| parent | bdc452b641f8379e00523e1340f71a46f5621be6 (diff) | |
| download | chromium_src-0eee9bb6ceb5f90f051ede8665fd05319328b54d.zip chromium_src-0eee9bb6ceb5f90f051ede8665fd05319328b54d.tar.gz chromium_src-0eee9bb6ceb5f90f051ede8665fd05319328b54d.tar.bz2 | |
Allow whitelisted content scripts to be injected in WebViews.
The code that tried to inject ChromeVox into WebViews in
chrome_web_view_guest_delegate.cc wasn't working. Instead, this allows
whitelisted content scripts to be injected into WebViews.
BUG=484904
Review URL: https://codereview.chromium.org/1140173003
Cr-Commit-Position: refs/heads/master@{#330193}
Diffstat (limited to 'extensions/renderer/user_script_set_manager.cc')
| -rw-r--r-- | extensions/renderer/user_script_set_manager.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extensions/renderer/user_script_set_manager.cc b/extensions/renderer/user_script_set_manager.cc index 5a317a1..1c8f72d 100644 --- a/extensions/renderer/user_script_set_manager.cc +++ b/extensions/renderer/user_script_set_manager.cc @@ -96,7 +96,8 @@ UserScriptSet* UserScriptSetManager::GetProgrammaticScriptsByHostID( void UserScriptSetManager::OnUpdateUserScripts( base::SharedMemoryHandle shared_memory, const HostID& host_id, - const std::set<HostID>& changed_hosts) { + const std::set<HostID>& changed_hosts, + bool whitelisted_only) { if (!base::SharedMemory::IsHandleValid(shared_memory)) { NOTREACHED() << "Bad scripts handle"; return; @@ -147,7 +148,9 @@ void UserScriptSetManager::OnUpdateUserScripts( effective_hosts = &all_hosts; } - if (scripts->UpdateUserScripts(shared_memory, *effective_hosts)) { + if (scripts->UpdateUserScripts(shared_memory, + *effective_hosts, + whitelisted_only)) { FOR_EACH_OBSERVER( Observer, observers_, |