summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host
diff options
context:
space:
mode:
authorpiman <piman@chromium.org>2016-03-22 12:37:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 19:39:22 +0000
commitf8396023a9e38d3ec249cdf1f730e4b79cebbc7e (patch)
tree1a6cc7be7f5844e0ac798d638668f02656a73c7f /content/browser/frame_host
parent5593ae4f2f4792363f4a0cbcc968b80529fd3a1e (diff)
downloadchromium_src-f8396023a9e38d3ec249cdf1f730e4b79cebbc7e.zip
chromium_src-f8396023a9e38d3ec249cdf1f730e4b79cebbc7e.tar.gz
chromium_src-f8396023a9e38d3ec249cdf1f730e4b79cebbc7e.tar.bz2
Remove a bunch of NPAPI quirks and related support code
BUG=493212 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Review URL: https://codereview.chromium.org/1813143002 Cr-Commit-Position: refs/heads/master@{#382642}
Diffstat (limited to 'content/browser/frame_host')
-rw-r--r--content/browser/frame_host/render_widget_host_view_child_frame.cc5
-rw-r--r--content/browser/frame_host/render_widget_host_view_child_frame.h1
-rw-r--r--content/browser/frame_host/render_widget_host_view_guest.cc5
-rw-r--r--content/browser/frame_host/render_widget_host_view_guest.h1
4 files changed, 0 insertions, 12 deletions
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 027f5e4..602be87 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -538,11 +538,6 @@ bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) {
}
-
-gfx::NativeViewId RenderWidgetHostViewChildFrame::GetParentForWindowlessPlugin()
- const {
- return NULL;
-}
#endif // defined(OS_WIN)
// cc::SurfaceFactoryClient implementation.
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 4336e10..507fce5 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -167,7 +167,6 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
#if defined(OS_WIN)
void SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) override;
- gfx::NativeViewId GetParentForWindowlessPlugin() const override;
#endif
BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc
index 10c8313..e9516eb 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc
@@ -515,11 +515,6 @@ void RenderWidgetHostViewGuest::UnlockCompositingSurface() {
void RenderWidgetHostViewGuest::SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) {
}
-
-gfx::NativeViewId RenderWidgetHostViewGuest::GetParentForWindowlessPlugin()
- const {
- return NULL;
-}
#endif
void RenderWidgetHostViewGuest::DestroyGuestView() {
diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h
index c46b6ef..52f1f8b 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.h
+++ b/content/browser/frame_host/render_widget_host_view_guest.h
@@ -137,7 +137,6 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
#if defined(OS_WIN)
void SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) override;
- gfx::NativeViewId GetParentForWindowlessPlugin() const override;
#endif
void WheelEventAck(const blink::WebMouseWheelEvent& event,