summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 03:37:39 +0000
committerfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 03:37:39 +0000
commit787ce9b4e86bc57a9e682bf83dff72890e65cfce (patch)
tree30c6e29eddeed8d9913c7c89fc47daad5c230f9c
parentcaea9d14849c66653026d51c63f0737a237b51ca (diff)
downloadchromium_src-787ce9b4e86bc57a9e682bf83dff72890e65cfce.zip
chromium_src-787ce9b4e86bc57a9e682bf83dff72890e65cfce.tar.gz
chromium_src-787ce9b4e86bc57a9e682bf83dff72890e65cfce.tar.bz2
BrowserPlugin: Removed unused parameter
A little bit of code cleanup. Removing an unused parameter in BrowserPlugin. BUG=none Review URL: https://codereview.chromium.org/104923003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238881 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/renderer/browser_plugin/browser_plugin.cc6
-rw-r--r--content/renderer/browser_plugin/browser_plugin.h15
-rw-r--r--content/renderer/browser_plugin/browser_plugin_manager.h4
-rw-r--r--content/renderer/browser_plugin/browser_plugin_manager_impl.cc5
-rw-r--r--content/renderer/browser_plugin/browser_plugin_manager_impl.h3
-rw-r--r--content/renderer/browser_plugin/mock_browser_plugin.cc5
-rw-r--r--content/renderer/browser_plugin/mock_browser_plugin.h3
-rw-r--r--content/renderer/browser_plugin/mock_browser_plugin_manager.cc6
-rw-r--r--content/renderer/browser_plugin/mock_browser_plugin_manager.h4
-rw-r--r--content/renderer/render_frame_impl.cc2
10 files changed, 18 insertions, 35 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 178f96d..0bc0f04 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -66,10 +66,8 @@ static base::LazyInstance<PluginContainerMap> g_plugin_container_map =
} // namespace
-BrowserPlugin::BrowserPlugin(
- RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const WebPluginParams& params)
+BrowserPlugin::BrowserPlugin(RenderViewImpl* render_view,
+ blink::WebFrame* frame)
: guest_instance_id_(browser_plugin::kInstanceIDNone),
attached_(false),
render_view_(render_view->AsWeakPtr()),
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index afaca69..f0d8758 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -203,16 +203,11 @@ class CONTENT_EXPORT BrowserPlugin :
friend class MockBrowserPlugin;
// A BrowserPlugin object is a controller that represents an instance of a
- // browser plugin within the embedder renderer process. Each BrowserPlugin
- // within a RenderView has a unique instance_id that is used to track per-
- // BrowserPlugin state in the browser process. Once a BrowserPlugin does
- // an initial navigation or is attached to a newly created guest, it acquires
- // a guest_instance_id as well. The guest instance ID uniquely identifies a
- // guest WebContents that's hosted by this BrowserPlugin.
- BrowserPlugin(
- RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params);
+ // browser plugin within the embedder renderer process. Once a BrowserPlugin
+ // does an initial navigation or is attached to a newly created guest, it
+ // acquires a guest_instance_id as well. The guest instance ID uniquely
+ // identifies a guest WebContents that's hosted by this BrowserPlugin.
+ BrowserPlugin(RenderViewImpl* render_view, blink::WebFrame* frame);
virtual ~BrowserPlugin();
diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h
index 687e62c..8a57c3d 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/browser_plugin_manager.h
@@ -45,9 +45,7 @@ class CONTENT_EXPORT BrowserPluginManager
// BrowserPluginManager via AddBrowserPlugin. When it is destroyed, it is
// responsible for removing its association via RemoveBrowserPlugin.
virtual BrowserPlugin* CreateBrowserPlugin(
- RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params) = 0;
+ RenderViewImpl* render_view, blink::WebFrame* frame) = 0;
// Asynchronously requests a new browser-process-allocated instance ID.
// After the browser process allocates an ID, it calls back into the
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
index 18ebeca..542af45 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
@@ -24,9 +24,8 @@ BrowserPluginManagerImpl::~BrowserPluginManagerImpl() {
BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin(
RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params) {
- return new BrowserPlugin(render_view, frame, params);
+ blink::WebFrame* frame) {
+ return new BrowserPlugin(render_view, frame);
}
void BrowserPluginManagerImpl::AllocateInstanceID(
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.h b/content/renderer/browser_plugin/browser_plugin_manager_impl.h
index 45f4ece..a046995 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.h
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.h
@@ -23,8 +23,7 @@ class BrowserPluginManagerImpl : public BrowserPluginManager {
// BrowserPluginManager implementation.
virtual BrowserPlugin* CreateBrowserPlugin(
RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params) OVERRIDE;
+ blink::WebFrame* frame) OVERRIDE;
virtual void AllocateInstanceID(
const base::WeakPtr<BrowserPlugin>& browser_plugin) OVERRIDE;
diff --git a/content/renderer/browser_plugin/mock_browser_plugin.cc b/content/renderer/browser_plugin/mock_browser_plugin.cc
index f39b13a..a19d0aa 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin.cc
+++ b/content/renderer/browser_plugin/mock_browser_plugin.cc
@@ -8,9 +8,8 @@
namespace content {
MockBrowserPlugin::MockBrowserPlugin(RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params)
- : BrowserPlugin(render_view, frame, params) {
+ blink::WebFrame* frame)
+ : BrowserPlugin(render_view, frame) {
}
MockBrowserPlugin::~MockBrowserPlugin() {}
diff --git a/content/renderer/browser_plugin/mock_browser_plugin.h b/content/renderer/browser_plugin/mock_browser_plugin.h
index 76621b5..ee0f554 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin.h
+++ b/content/renderer/browser_plugin/mock_browser_plugin.h
@@ -12,8 +12,7 @@ namespace content {
class MockBrowserPlugin : public BrowserPlugin {
public:
MockBrowserPlugin(RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params);
+ blink::WebFrame* frame);
virtual ~MockBrowserPlugin();
diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
index c3656400..4a60686 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
+++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
@@ -21,10 +21,8 @@ MockBrowserPluginManager::~MockBrowserPluginManager() {
}
BrowserPlugin* MockBrowserPluginManager::CreateBrowserPlugin(
- RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params) {
- return new MockBrowserPlugin(render_view, frame, params);
+ RenderViewImpl* render_view, blink::WebFrame* frame) {
+ return new MockBrowserPlugin(render_view, frame);
}
void MockBrowserPluginManager::AllocateInstanceID(
diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.h b/content/renderer/browser_plugin/mock_browser_plugin_manager.h
index 544d263..83d55a5 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.h
@@ -19,9 +19,7 @@ class MockBrowserPluginManager : public BrowserPluginManager {
// BrowserPluginManager implementation.
virtual BrowserPlugin* CreateBrowserPlugin(
- RenderViewImpl* render_view,
- blink::WebFrame* frame,
- const blink::WebPluginParams& params) OVERRIDE;
+ RenderViewImpl* render_view, blink::WebFrame* frame) OVERRIDE;
virtual void AllocateInstanceID(
const base::WeakPtr<BrowserPlugin>& browser_plugin) OVERRIDE;
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f349ef0..2278e92 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -504,7 +504,7 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
if (UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) {
return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin(
- render_view_, frame, params);
+ render_view_, frame);
}
#if defined(ENABLE_PLUGINS)