diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-18 12:43:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-18 12:43:31 +0000 |
| commit | 49a2000d8b22643af5cf092211f3ba246c4911ee (patch) | |
| tree | ff0aa73a7789b9d5094a02e8a4615e5ea0957acf /chrome/renderer/plugins | |
| parent | 697877df1423fff667f2653453e8f5f0fd8ceee0 (diff) | |
| download | chromium_src-49a2000d8b22643af5cf092211f3ba246c4911ee.zip chromium_src-49a2000d8b22643af5cf092211f3ba246c4911ee.tar.gz chromium_src-49a2000d8b22643af5cf092211f3ba246c4911ee.tar.bz2 | |
Move webpreferences_renderer.* into content.
BUG=265753
TEST=content_shell
R=jamesr@chromium.org,jam@chromium.org,piman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23020011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins')
| -rw-r--r-- | chrome/renderer/plugins/webview_plugin.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/renderer/plugins/webview_plugin.cc b/chrome/renderer/plugins/webview_plugin.cc index eb1fea7..2853a313 100644 --- a/chrome/renderer/plugins/webview_plugin.cc +++ b/chrome/renderer/plugins/webview_plugin.cc @@ -6,6 +6,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" +#include "content/public/renderer/web_preferences.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebURL.h" @@ -19,7 +20,6 @@ #include "third_party/WebKit/public/web/WebPluginContainer.h" #include "third_party/WebKit/public/web/WebView.h" #include "webkit/common/webpreferences.h" -#include "webkit/renderer/webpreferences_renderer.h" using WebKit::WebCanvas; using WebKit::WebCursorInfo; @@ -50,14 +50,13 @@ WebViewPlugin::WebViewPlugin(WebViewPlugin::Delegate* delegate) } // static -WebViewPlugin* WebViewPlugin::Create( - WebViewPlugin::Delegate* delegate, - const WebPreferences& preferences, - const std::string& html_data, - const GURL& url) { +WebViewPlugin* WebViewPlugin::Create(WebViewPlugin::Delegate* delegate, + const WebPreferences& preferences, + const std::string& html_data, + const GURL& url) { WebViewPlugin* plugin = new WebViewPlugin(delegate); WebView* web_view = plugin->web_view(); - webkit_glue::ApplyWebPreferences(preferences, web_view); + content::ApplyWebPreferences(preferences, web_view); web_view->mainFrame()->loadHTMLString(html_data, url); return plugin; } |