summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-31 00:38:59 +0000
committerfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-31 00:38:59 +0000
commitba0dc14fb2a432cc3c0c1303dfe79664ba34b3c8 (patch)
tree6740d6c26cfc394084e5884e88c6a37cec6e847a /content
parent8fc28d7264c072ed77d4d9ffeee5a2359db17843 (diff)
downloadchromium_src-ba0dc14fb2a432cc3c0c1303dfe79664ba34b3c8.zip
chromium_src-ba0dc14fb2a432cc3c0c1303dfe79664ba34b3c8.tar.gz
chromium_src-ba0dc14fb2a432cc3c0c1303dfe79664ba34b3c8.tar.bz2
Browser Plugin: Remove Zoom
With the zoom refactor in flight: https://codereview.chromium.org/287093002/, zoom plumbing for BrowserPlugin in the content layer is now entirely dead code. We need to revisit zoom in the chrome layer for <webview> so that the embedder's zoom is propagated to the guests. This will be done at a later time when we need to get <webview> in WebUI working again. BUG=330264 TBR=jam@chromium.org for trivial browser_plugin_guest_delegate.h code deletion. Review URL: https://codereview.chromium.org/303423002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/browser_plugin/browser_plugin_embedder.cc17
-rw-r--r--content/browser/browser_plugin/browser_plugin_embedder.h3
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest.cc5
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest.h2
-rw-r--r--content/public/browser/browser_plugin_guest_delegate.h3
5 files changed, 0 insertions, 30 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc
index 1c0df05..bccd6e6 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
@@ -86,23 +86,6 @@ void BrowserPluginEmbedder::DidSendScreenRects() {
base::Unretained(this)));
}
-bool BrowserPluginEmbedder::SetZoomLevelCallback(
- double level, WebContents* guest_web_contents) {
- double zoom_factor = content::ZoomLevelToZoomFactor(level);
- static_cast<WebContentsImpl*>(guest_web_contents)->GetBrowserPluginGuest()->
- SetZoom(zoom_factor);
- // Not handled => Iterate over all guests.
- return false;
-}
-
-void BrowserPluginEmbedder::SetZoomLevel(double level) {
- GetBrowserPluginGuestManager()->ForEachGuest(
- GetWebContents(), base::Bind(
- &BrowserPluginEmbedder::SetZoomLevelCallback,
- base::Unretained(this),
- level));
-}
-
bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(BrowserPluginEmbedder, message)
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index fb93c67..137f0c5 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -56,9 +56,6 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
factory_ = factory;
}
- // Sets the zoom level for all guests within this embedder.
- void SetZoomLevel(double level);
-
// WebContentsObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index aca15a0..15c3dcf 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -342,11 +342,6 @@ void BrowserPluginGuest::EmbedderVisibilityChanged(bool visible) {
UpdateVisibility();
}
-void BrowserPluginGuest::SetZoom(double zoom_factor) {
- if (delegate_)
- delegate_->SetZoom(zoom_factor);
-}
-
void BrowserPluginGuest::PointerLockPermissionResponse(bool allow) {
SendMessageToEmbedder(
new BrowserPluginMsg_SetMouseLock(instance_id(), allow));
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index 4032634..d72073c 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -210,8 +210,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
BrowserPluginGuest::factory_ = factory;
}
- void SetZoom(double zoom_factor);
-
void PointerLockPermissionResponse(bool allow);
private:
diff --git a/content/public/browser/browser_plugin_guest_delegate.h b/content/public/browser/browser_plugin_guest_delegate.h
index 66129cf..ed527b1 100644
--- a/content/public/browser/browser_plugin_guest_delegate.h
+++ b/content/public/browser/browser_plugin_guest_delegate.h
@@ -26,9 +26,6 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
// Notification that the embedder has completed attachment.
virtual void DidAttach() {}
- // Requests setting the zoom level to the provided |zoom_level|.
- virtual void SetZoom(double zoom_factor) {}
-
virtual bool IsDragAndDropEnabled();
// Notifies that the content size of the guest has changed in autosize mode.