Index: content/browser/renderer_host/render_widget_host_view_aura.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h |
index 98c969bd4a998c0e2c1492268996350d5f6172fe..73e210af6625133327af74fbbad620e527cb6b9a 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -128,7 +128,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
touch_editing_client_ = client; |
} |
- explicit RenderWidgetHostViewAura(RenderWidgetHost* host); |
+ RenderWidgetHostViewAura(RenderWidgetHost* host); |
// RenderWidgetHostView implementation. |
virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE; |
@@ -230,6 +230,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; |
#if defined(OS_WIN) |
+ void SetLegacyRenderWidgetHostHWND(LegacyRenderWidgetHostHWND* legacy_hwnd); |
virtual void SetParentNativeViewAccessible( |
gfx::NativeViewAccessible accessible_parent) OVERRIDE; |
virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; |
@@ -327,9 +328,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// Updates the cursor clip region. Used for mouse locking. |
void UpdateMouseLockRegion(); |
- |
- // Notification that the LegacyRenderWidgetHostHWND was destroyed. |
- void OnLegacyWindowDestroyed(); |
#endif |
// Method to indicate if this instance is shutting down or closing. |
@@ -577,16 +575,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// for accessibility, as the container for windowless plugins like |
// Flash/Silverlight, etc and for legacy drivers for trackpoints/trackpads, |
// etc. |
- // The LegacyRenderWidgetHostHWND instance is created during the first call |
- // to RenderWidgetHostViewAura::InternalSetBounds. The instance is destroyed |
- // when the LegacyRenderWidgetHostHWND hwnd is destroyed. |
content::LegacyRenderWidgetHostHWND* legacy_render_widget_host_HWND_; |
- |
- // Set to true if the legacy_render_widget_host_HWND_ instance was destroyed |
- // by Windows. This could happen if the browser window was destroyed by |
- // DestroyWindow for e.g. This flag helps ensure that we don't try to create |
- // the LegacyRenderWidgetHostHWND instance again as that would be a futile |
- // exercise. |
bool legacy_window_destroyed_; |
ananta
2014/09/23 20:14:06
Please remove this member.
dmazzoni
2014/09/24 22:57:51
Done.
|
#endif |