summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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