commit cb25aa1b3f467762635a13145a59c5b60075342a
author fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Aug 07 19:13:43 2012
committer fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Aug 07 19:13:43 2012
tree a23e5b318ff3d191e8634db6237661f895df7b70
parent d37789d7be1682d25d86dae163c900ae5c78c1b3

Browser Plugin: Move to old namespace

Move the existing implementation of the browser plugin to the content::old
to avoid class name collisions with the new version currently being upstreamed.

BUG=140306

Review URL: https://chromiumcodereview.appspot.com/10829219

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150387 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/render_thread_impl.h

diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index eaddfc8..091d256 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -54,10 +54,14 @@
 
 namespace content {
 class AudioRendererMixerManager;
-class BrowserPluginChannelManager;
-class BrowserPluginRegistry;
 class MediaStreamCenter;
 class RenderProcessObserver;
+
+namespace old {
+class BrowserPluginChannelManager;
+class BrowserPluginRegistry;
+}
+
 }
 
 namespace v8 {
@@ -165,11 +169,12 @@
     return compositor_thread_.get();
   }
 
-  content::BrowserPluginRegistry* browser_plugin_registry() const {
+  content::old::BrowserPluginRegistry* browser_plugin_registry() const {
     return browser_plugin_registry_.get();
   }
 
-  content::BrowserPluginChannelManager* browser_plugin_channel_manager() const {
+  content::old::BrowserPluginChannelManager*
+      browser_plugin_channel_manager() const {
     return browser_plugin_channel_manager_.get();
   }
 
@@ -245,7 +250,7 @@
   scoped_ptr<DomStorageDispatcher> dom_storage_dispatcher_;
   scoped_ptr<IndexedDBDispatcher> main_thread_indexed_db_dispatcher_;
   scoped_ptr<RendererWebKitPlatformSupportImpl> webkit_platform_support_;
-  scoped_ptr<content::BrowserPluginChannelManager>
+  scoped_ptr<content::old::BrowserPluginChannelManager>
       browser_plugin_channel_manager_;
 
   // Used on the render thread and deleted by WebKit at shutdown.
@@ -295,7 +300,7 @@
 
   bool compositor_initialized_;
   scoped_ptr<CompositorThread> compositor_thread_;
-  scoped_ptr<content::BrowserPluginRegistry> browser_plugin_registry_;
+  scoped_ptr<content::old::BrowserPluginRegistry> browser_plugin_registry_;
 
   ObserverList<content::RenderProcessObserver> observers_;