summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2014-09-22 13:32:57 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-22 20:33:08 +0000
commitbe9476315e48d2eeeaaa5a9078e0f66b1673f2bd (patch)
tree379b48aaf910f69d58c04c9043a91cd67130b949 /content
parente65548faa0ad7b8ec5249982c3f816dc1403aa9e (diff)
downloadchromium_src-be9476315e48d2eeeaaa5a9078e0f66b1673f2bd.zip
chromium_src-be9476315e48d2eeeaaa5a9078e0f66b1673f2bd.tar.gz
chromium_src-be9476315e48d2eeeaaa5a9078e0f66b1673f2bd.tar.bz2
Browser Plugin: Minor cleanup
BUG=none Review URL: https://codereview.chromium.org/594623002 Cr-Commit-Position: refs/heads/master@{#296043}
Diffstat (limited to 'content')
-rw-r--r--content/renderer/browser_plugin/browser_plugin.cc2
-rw-r--r--content/renderer/browser_plugin/browser_plugin.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 2fdd343..b51b452 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -25,14 +25,12 @@
#include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
-#include "third_party/WebKit/public/web/WebPluginParams.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "ui/events/keycodes/keyboard_codes.h"
using blink::WebCanvas;
using blink::WebPluginContainer;
-using blink::WebPluginParams;
using blink::WebPoint;
using blink::WebRect;
using blink::WebURL;
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index ee521c0..11f7661 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -160,8 +160,7 @@ class CONTENT_EXPORT BrowserPlugin :
gfx::Size plugin_size() const { return plugin_rect_.size(); }
gfx::Rect plugin_rect() const { return plugin_rect_; }
- // Virtual to allow for mocking in tests.
- virtual float GetDeviceScaleFactor() const;
+ float GetDeviceScaleFactor() const;
void ShowSadGraphic();
@@ -207,7 +206,6 @@ class CONTENT_EXPORT BrowserPlugin :
WebCursor cursor_;
- gfx::Size last_view_size_;
bool mouse_locked_;
// BrowserPlugin outlives RenderViewImpl in Chrome Apps and so we need to