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

Unified Diff: components/plugins/renderer/plugin_placeholder.cc

Issue 1158063002: Add plugins::TestPluginPlaceholder class and allow its use in Blink layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pluginfix
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | content/content_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/plugins/renderer/plugin_placeholder.cc
diff --git a/components/plugins/renderer/plugin_placeholder.cc b/components/plugins/renderer/plugin_placeholder.cc
index 8bbe491c405cded2a3c55e8613179f48ee962fb1..180e913896646407dc8590222d78ebaa3d795805 100644
--- a/components/plugins/renderer/plugin_placeholder.cc
+++ b/components/plugins/renderer/plugin_placeholder.cc
@@ -4,6 +4,7 @@
#include "components/plugins/renderer/plugin_placeholder.h"
+#include "content/public/common/web_preferences.h"
#include "content/public/renderer/render_frame.h"
namespace plugins {
@@ -19,7 +20,9 @@ PluginPlaceholder::PluginPlaceholder(content::RenderFrame* render_frame,
frame_(frame),
plugin_params_(params),
plugin_(WebViewPlugin::Create(this,
- render_frame->GetWebkitPreferences(),
+ render_frame
+ ? render_frame->GetWebkitPreferences()
+ : content::WebPreferences(),
html_data,
placeholderDataUrl)) {
DCHECK(placeholderDataUrl.is_valid())
« no previous file with comments | « no previous file | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698