Index: extensions/shell/browser/shell_content_browser_client.cc |
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc |
index 4aba570654e71be5a022d0698176d8f4c539056f..c9514c7a8895a338dd44c1a2ad8f9ef5dd5e844f 100644 |
--- a/extensions/shell/browser/shell_content_browser_client.cc |
+++ b/extensions/shell/browser/shell_content_browser_client.cc |
@@ -5,6 +5,7 @@ |
#include "extensions/shell/browser/shell_content_browser_client.h" |
#include "base/command_line.h" |
+#include "components/guest_view/browser/guest_view_message_filter.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/render_process_host.h" |
#include "content/public/browser/site_instance.h" |
@@ -16,7 +17,7 @@ |
#include "extensions/browser/extension_message_filter.h" |
#include "extensions/browser/extension_protocols.h" |
#include "extensions/browser/extension_registry.h" |
-#include "extensions/browser/guest_view/guest_view_message_filter.h" |
+#include "extensions/browser/guest_view/extensions_guest_view_message_filter.h" |
#include "extensions/browser/info_map.h" |
#include "extensions/browser/io_thread_extension_message_filter.h" |
#include "extensions/browser/process_map.h" |
@@ -93,7 +94,11 @@ void ShellContentBrowserClient::RenderProcessWillLaunch( |
host->AddFilter( |
new IOThreadExtensionMessageFilter(render_process_id, browser_context)); |
host->AddFilter( |
- new GuestViewMessageFilter(render_process_id, browser_context)); |
+ new guestview::GuestViewMessageFilter( |
+ render_process_id, browser_context)); |
+ host->AddFilter( |
lazyboy
2015/04/30 19:31:07
Add this change to CL description
Fady Samuel
2015/04/30 23:26:04
Done.
|
+ new ExtensionsGuestViewMessageFilter( |
+ render_process_id, browser_context)); |
// PluginInfoMessageFilter is not required because app_shell does not have |
// the concept of disabled plugins. |
#if !defined(DISABLE_NACL) |