Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1665)

Unified Diff: content/renderer/pepper/plugin_module.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/plugin_module.cc
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
index 5e126ab99f6d327119835f99db75226c5db92758..1c818a738e9b6e743f09f743d048e71442a47009 100644
--- a/content/renderer/pepper/plugin_module.cc
+++ b/content/renderer/pepper/plugin_module.cc
@@ -22,6 +22,7 @@
#include "content/renderer/pepper/pepper_hung_plugin_filter.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/pepper/pepper_plugin_registry.h"
+#include "content/renderer/pepper/ppapi_preferences_builder.h"
#include "content/renderer/pepper/ppb_image_data_impl.h"
#include "content/renderer/pepper/ppb_proxy_impl.h"
#include "content/renderer/pepper/ppb_scrollbar_impl.h"
@@ -620,11 +621,11 @@ RendererPpapiHostImpl* PluginModule::CreateOutOfProcessModule(
path, render_frame->GetRoutingID(), plugin_child_id));
scoped_ptr<HostDispatcherWrapper> dispatcher(new HostDispatcherWrapper(
this, peer_pid, plugin_child_id, permissions, is_external));
- if (!dispatcher->Init(
- channel_handle,
- &GetInterface,
- ppapi::Preferences(render_frame->render_view()->webkit_preferences()),
- hung_filter.get()))
+ if (!dispatcher->Init(channel_handle,
+ &GetInterface,
+ ppapi::Preferences(PpapiPreferencesBuilder::Build(
+ render_frame->render_view()->webkit_preferences())),
+ hung_filter.get()))
return NULL;
RendererPpapiHostImpl* host_impl =
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/ppapi_preferences_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698