Chromium Code Reviews| Index: extensions/browser/guest_view/web_view/web_view_guest.cc |
| diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc |
| index 3f7b9d880211494acaa7da6b0c320ef97da37ea6..7470fecba9a005d4af935a38e04c15a68d0a35d6 100644 |
| --- a/extensions/browser/guest_view/web_view/web_view_guest.cc |
| +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc |
| @@ -37,6 +37,7 @@ |
| #include "extensions/browser/extension_system.h" |
| #include "extensions/browser/guest_view/guest_view_manager.h" |
| #include "extensions/browser/guest_view/web_view/web_view_constants.h" |
| +#include "extensions/browser/guest_view/web_view/web_view_content_script_manager.h" |
| #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" |
| #include "extensions/browser/guest_view/web_view/web_view_permission_types.h" |
| #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" |
| @@ -872,6 +873,14 @@ void WebViewGuest::PushWebViewStateToIOThread() { |
| web_view_info.owner_extension_id = owner_extension_id(); |
| web_view_info.rules_registry_id = rules_registry_id_; |
| + // Get content scripts IDs added by the guest. |
| + WebViewContentScriptManager* manager = |
| + WebViewContentScriptManager::Get(browser_context()); |
| + if (manager) { |
|
Devlin
2015/04/14 23:04:57
When can this be null?
Xi Han
2015/04/15 19:43:56
Change to DCHECK.
|
| + web_view_info.content_script_ids = manager->GetContentScriptIDSet( |
| + web_view_info.embedder_process_id, web_view_info.instance_id); |
| + } |
| + |
| content::BrowserThread::PostTask( |
| content::BrowserThread::IO, |
| FROM_HERE, |