Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1065)

Unified Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 387353004: Create only a single LegacyRenderWidgetHostHWND per WebContentsViewAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render_frame_ax_3
Patch Set: Oops, forgot to upload delegate in new file Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_view_aura.h
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
index 00a5b37df908e94f3135693ed6ffe534cc491b9a..a4658ee51833804126193dacfdf656ca5d184fe8 100644
--- a/content/browser/web_contents/web_contents_view_aura.h
+++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -18,6 +18,11 @@
#include "ui/compositor/layer_animation_observer.h"
#include "ui/wm/public/drag_drop_delegate.h"
+#if defined(OS_WIN)
+#include "content/browser/renderer_host/legacy_render_widget_host_win.h"
+#include "content/browser/renderer_host/legacy_render_widget_host_win_delegate.h"
+#endif
+
namespace aura {
class Window;
}
@@ -37,8 +42,15 @@ class WebContentsViewDelegate;
class WebContentsImpl;
class WebDragDestDelegate;
+#if defined(OS_WIN)
+class LegacyRenderWidgetHostHWND;
+#endif
+
class WebContentsViewAura
: public WebContentsView,
+#if defined(OS_WIN)
+ public LegacyRenderWidgetHostHWNDDelegate,
+#endif
public RenderViewHostDelegateView,
public OverscrollControllerDelegate,
public ui::ImplicitAnimationObserver,
@@ -190,6 +202,11 @@ class WebContentsViewAura
// Update the web contents visiblity.
void UpdateWebContentsVisibility(bool visible);
+#if defined(OS_WIN)
+ // Overridden from LegacyRenderWidgetHostHWNDDelegate:
+ virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
+#endif
+
scoped_ptr<aura::Window> window_;
// The window that shows the screenshot of the history page during an
@@ -233,6 +250,14 @@ class WebContentsViewAura
scoped_ptr<TouchEditableImplAura> touch_editable_;
scoped_ptr<GestureNavSimple> gesture_nav_simple_;
+#if defined(OS_WIN)
+ // The LegacyRenderWidgetHostHWND class provides a dummy HWND which is used
+ // for accessibility, as the container for windowless plugins like
+ // Flash/Silverlight, etc and for legacy drivers for trackpoints/trackpads,
+ // etc.
+ scoped_ptr<LegacyRenderWidgetHostHWND> legacy_hwnd_;
+#endif
+
// On Windows we can run into problems if resources get released within the
// initialization phase while the content (and its dimensions) are not known.
bool is_or_was_visible_;
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698