summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 05:36:38 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 05:36:38 +0000
commit0d64bb701b65d583ad7439afe3188df055fd0e04 (patch)
treee1840ec5212e743b1821c3c4d19f0e416f17313c /chrome/renderer/render_view.cc
parent4f1629ad859f74144d79974eb81867c6324e0894 (diff)
downloadchromium_src-0d64bb701b65d583ad7439afe3188df055fd0e04.zip
chromium_src-0d64bb701b65d583ad7439afe3188df055fd0e04.tar.gz
chromium_src-0d64bb701b65d583ad7439afe3188df055fd0e04.tar.bz2
Move default_plugin from webkit/ to chrome/
Second try, first try at http://codereview.chromium.org/2803035 . Also contains http://codereview.chromium.org/2838044 , changes to DEPS files (mostly cleanups), and a change to webkit/glue/plugins/webplugin_delegate_impl_win.cc . BUG= 48419 TEST=everything still builds Review URL: http://codereview.chromium.org/2813047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index bb7d877..f05e975 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -111,7 +111,6 @@
#include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
#include "third_party/WebKit/WebKit/chromium/public/WebWindowFeatures.h"
#include "webkit/appcache/web_application_cache_host_impl.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
#include "webkit/glue/dom_operations.h"
#include "webkit/glue/form_data.h"
#include "webkit/glue/form_field.h"
@@ -121,6 +120,7 @@
#include "webkit/glue/media/simple_data_source.h"
#include "webkit/glue/media/video_renderer_impl.h"
#include "webkit/glue/password_form.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
#include "webkit/glue/plugins/pepper_webplugin_impl.h"
#include "webkit/glue/plugins/plugin_list.h"
#include "webkit/glue/plugins/webplugin_delegate.h"