summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_thread.cc
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 00:40:50 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 00:40:50 +0000
commit099587b7a8bf441af62251275197973203e2f11a (patch)
treea8e0711b152925dbc2102b692d6ceec19e881fa3 /content/renderer/render_thread.cc
parent79311e89bc4fbd952d5ce872011f8360bfa5e6e6 (diff)
downloadchromium_src-099587b7a8bf441af62251275197973203e2f11a.zip
chromium_src-099587b7a8bf441af62251275197973203e2f11a.tar.gz
chromium_src-099587b7a8bf441af62251275197973203e2f11a.tar.bz2
Move NPObjectBase and PluginChannelBase from content/plugin to content/common
Also rename PluginChannelBase to NPChannelBase, fix variable naming to be agnostic of plugins, and fix a comment in NPChannelBase. This change is refactoring only and introduces no change in behaviour. BUG=96703 Review URL: http://codereview.chromium.org/7891003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread.cc')
-rw-r--r--content/renderer/render_thread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 3be07a4..3e11f98 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -74,7 +74,7 @@
#include "content/plugin/plugin_channel.h"
#else
#include "base/memory/scoped_handle.h"
-#include "content/plugin/plugin_channel_base.h"
+#include "content/common/np_channel_base.h"
#endif
#if defined(OS_WIN)
@@ -245,7 +245,7 @@ RenderThread::~RenderThread() {
// TODO(port)
#if defined(OS_WIN)
// Clean up plugin channels before this thread goes away.
- PluginChannelBase::CleanupChannels();
+ NPChannelBase::CleanupChannels();
// Don't call COM if the renderer is in the sandbox.
if (RenderProcessImpl::InProcessPlugins())
CoUninitialize();