summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 07:50:44 +0000
committerfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 07:50:44 +0000
commita7568e6ceb0eeee5b59ced56e1bf01fb39719dc8 (patch)
treef5df27586cf4dae6dd9f47a33609f144008998d3
parent092cc497a8baf40b6d28c15b0f5cd6b65ffa438d (diff)
downloadchromium_src-a7568e6ceb0eeee5b59ced56e1bf01fb39719dc8.zip
chromium_src-a7568e6ceb0eeee5b59ced56e1bf01fb39719dc8.tar.gz
chromium_src-a7568e6ceb0eeee5b59ced56e1bf01fb39719dc8.tar.bz2
Browser Pluign: Remove unnecessary parameter in DidSendScreenRects
BUG=none Review URL: https://chromiumcodereview.appspot.com/17023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206365 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/browser_plugin/browser_plugin_embedder.cc5
-rw-r--r--content/browser/browser_plugin/browser_plugin_embedder.h2
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest_manager.cc2
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest_manager.h3
-rw-r--r--content/browser/web_contents/web_contents_impl.cc2
5 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc
index 9f5a8bb..45aa1d8 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
@@ -76,8 +76,9 @@ void BrowserPluginEmbedder::GetRenderViewHostAtPosition(
++next_get_render_view_request_id_;
}
-void BrowserPluginEmbedder::DidSendScreenRects(RenderWidgetHostImpl* rwh) {
- GetBrowserPluginGuestManager()->DidSendScreenRects(web_contents(), rwh);
+void BrowserPluginEmbedder::DidSendScreenRects() {
+ GetBrowserPluginGuestManager()->DidSendScreenRects(
+ static_cast<WebContentsImpl*>(web_contents()));
}
void BrowserPluginEmbedder::RenderViewGone(base::TerminationStatus status) {
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index 3dbb3f3..0ba85c4 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -51,7 +51,7 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
const WebContents::GetRenderViewHostCallback& callback);
// Called when embedder's |rwh| has sent screen rects to renderer.
- void DidSendScreenRects(RenderWidgetHostImpl* rwh);
+ void DidSendScreenRects();
// Overrides factory for testing. Default (NULL) value indicates regular
// (non-test) environment.
diff --git a/content/browser/browser_plugin/browser_plugin_guest_manager.cc b/content/browser/browser_plugin/browser_plugin_guest_manager.cc
index 1a33e9a..6859217 100644
--- a/content/browser/browser_plugin/browser_plugin_guest_manager.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest_manager.cc
@@ -231,7 +231,7 @@ void BrowserPluginGuestManager::OnUnhandledSwapBuffersACK(
}
void BrowserPluginGuestManager::DidSendScreenRects(
- WebContents* embedder_web_contents, RenderWidgetHostImpl* rwh) {
+ WebContentsImpl* embedder_web_contents) {
// TODO(lazyboy): Generalize iterating over guest instances and performing
// actions on the guests.
for (GuestInstanceMap::iterator it =
diff --git a/content/browser/browser_plugin/browser_plugin_guest_manager.h b/content/browser/browser_plugin/browser_plugin_guest_manager.h
index f915362..ba5d2f0 100644
--- a/content/browser/browser_plugin/browser_plugin_guest_manager.h
+++ b/content/browser/browser_plugin/browser_plugin_guest_manager.h
@@ -80,8 +80,7 @@ class CONTENT_EXPORT BrowserPluginGuestManager :
bool CanEmbedderAccessInstanceIDMaybeKill(int embedder_render_process_id,
int instance_id) const;
- void DidSendScreenRects(WebContents* embedder_web_contents,
- RenderWidgetHostImpl* rwh);
+ void DidSendScreenRects(WebContentsImpl* embedder_web_contents);
void OnMessageReceived(const IPC::Message& message, int render_process_id);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7e42108..4d36568 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1706,7 +1706,7 @@ void WebContentsImpl::RequestMediaAccessPermission(
void WebContentsImpl::DidSendScreenRects(RenderWidgetHostImpl* rwh) {
if (browser_plugin_embedder_)
- browser_plugin_embedder_->DidSendScreenRects(rwh);
+ browser_plugin_embedder_->DidSendScreenRects();
}
void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) {