diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:13:47 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:13:47 +0000 |
| commit | 29e2fb456d3bf933168cf24bccaf05b1bea862fc (patch) | |
| tree | 43eacb9a2201da4c6eaaa658facf35f9addd2a5b /content/utility | |
| parent | 83aa2eda2999b74dab6cb22d677acaaefa044da7 (diff) | |
| download | chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.zip chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.tar.gz chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.tar.bz2 | |
Move NPAPI implementation out of webkit/plugins/npapi and into content.
Notes:
-gtk_plugin_container_manager* and gtk_plugin_container* move to content/browser/renderer_host/ since that's all where they're used
-plugin_list* and plugin_constants_win* move to content/common as they're used by child processes and the browser
-webplugin_impl* and webplugin_page_delegate.h move to content/renderer as that's where they're used. I will remove webplugin_page_delegate.h in a followup change as it's no longer needed.
-the rest moves to content/child/npapi
-a few constants moved from plugin_constants_win.h to plugin_util.h temporarily
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/19761007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
| -rw-r--r-- | content/utility/utility_thread_impl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 16d87ef..f0e483b 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -12,12 +12,12 @@ #include "content/child/child_process.h" #include "content/child/webkitplatformsupport_impl.h" #include "content/common/child_process_messages.h" +#include "content/common/plugin_list.h" #include "content/common/utility_messages.h" #include "content/public/common/content_switches.h" #include "content/public/utility/content_utility_client.h" #include "ipc/ipc_sync_channel.h" #include "third_party/WebKit/public/web/WebKit.h" -#include "webkit/plugins/npapi/plugin_list.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> @@ -128,8 +128,7 @@ void UtilityThreadImpl::OnBatchModeFinished() { #if defined(OS_POSIX) void UtilityThreadImpl::OnLoadPlugins( const std::vector<base::FilePath>& plugin_paths) { - webkit::npapi::PluginList* plugin_list = - webkit::npapi::PluginList::Singleton(); + PluginList* plugin_list = PluginList::Singleton(); // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that // before attempting to call into the plugin. |