Browser Plugin: Rename WebContentsImpl::browser_plugin_host() to WebContentsImpl::old_browser_plugin_host()
To avoid name collision with the new BrowserPluginHost implementation, rename the accessor in WebContentsImpl.
BUG=141232
Review URL: https://chromiumcodereview.appspot.com/10826192
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150480 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index baa4e19..0c2857b3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -375,7 +375,7 @@
new JavaBridgeDispatcherHostManager(this));
#endif
- browser_plugin_host_.reset(new content::old::BrowserPluginHost(this));
+ old_browser_plugin_host_.reset(new content::old::BrowserPluginHost(this));
}
WebContentsImpl::~WebContentsImpl() {
@@ -3151,8 +3151,8 @@
std::string* embedder_channel_name,
int* embedder_container_id) {
content::RenderProcessHost* embedder_render_process_host =
- browser_plugin_host()->embedder_render_process_host();
- *embedder_container_id = browser_plugin_host()->instance_id();
+ old_browser_plugin_host()->embedder_render_process_host();
+ *embedder_container_id = old_browser_plugin_host()->instance_id();
int embedder_process_id =
embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
if (embedder_process_id != -1) {
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index d6b5138..8aba2c2 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -142,8 +142,8 @@
return java_bridge_dispatcher_host_manager_.get();
}
- content::old::BrowserPluginHost* browser_plugin_host() const {
- return browser_plugin_host_.get();
+ content::old::BrowserPluginHost* old_browser_plugin_host() const {
+ return old_browser_plugin_host_.get();
}
// Like GetController from WebContents, but returns the concrete object.
@@ -674,8 +674,10 @@
scoped_ptr<JavaBridgeDispatcherHostManager>
java_bridge_dispatcher_host_manager_;
+ // TODO(fsamuel): Remove this once upstreaming of the new browser plugin
+ // implmentation is complete.
// Manages the browser plugin instances hosted by this WebContents.
- scoped_ptr<content::old::BrowserPluginHost> browser_plugin_host_;
+ scoped_ptr<content::old::BrowserPluginHost> old_browser_plugin_host_;
// SavePackage, lazily created.
scoped_refptr<SavePackage> save_package_;
