| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 class Display; | 59 class Display; |
| 60 } | 60 } |
| 61 | 61 |
| 62 namespace ui { | 62 namespace ui { |
| 63 class CompositorLock; | 63 class CompositorLock; |
| 64 class InputMethod; | 64 class InputMethod; |
| 65 class Texture; | 65 class Texture; |
| 66 } | 66 } |
| 67 | 67 |
| 68 namespace content { | 68 namespace content { |
| 69 #if defined(OS_WIN) |
| 70 class LegacyRenderWidgetHostHWND; |
| 71 #endif |
| 72 |
| 69 class RenderWidgetHostImpl; | 73 class RenderWidgetHostImpl; |
| 70 class RenderWidgetHostView; | 74 class RenderWidgetHostView; |
| 71 class ResizeLock; | 75 class ResizeLock; |
| 72 | 76 |
| 73 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. | 77 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. |
| 74 class CONTENT_EXPORT RenderWidgetHostViewAura | 78 class CONTENT_EXPORT RenderWidgetHostViewAura |
| 75 : public RenderWidgetHostViewBase, | 79 : public RenderWidgetHostViewBase, |
| 76 public ui::CompositorObserver, | 80 public ui::CompositorObserver, |
| 77 public ui::TextInputClient, | 81 public ui::TextInputClient, |
| 78 public gfx::DisplayObserver, | 82 public gfx::DisplayObserver, |
| (...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 unsigned frame_id; | 801 unsigned frame_id; |
| 798 }; | 802 }; |
| 799 scoped_ptr<ReleasedFrameInfo> released_software_frame_; | 803 scoped_ptr<ReleasedFrameInfo> released_software_frame_; |
| 800 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; | 804 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; |
| 801 | 805 |
| 802 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; | 806 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; |
| 803 | 807 |
| 804 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 808 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 805 | 809 |
| 806 #if defined(OS_WIN) | 810 #if defined(OS_WIN) |
| 807 // The dummy HWND which corresponds to the bounds of the web page. This is | 811 // The LegacyRenderWidgetHostHWND class provides a dummy HWND which is used |
| 808 // passed to windowless plugins like Flash/Silverlight, etc as the | 812 // for accessibility, as the container for windowless plugins like |
| 809 // container window. | 813 // Flash/Silverlight, etc and for legacy drivers for trackpoints/trackpads, |
| 810 HWND plugin_parent_window_; | 814 // etc. |
| 815 // This instance is deleted when the parent window is destroyed. |
| 816 content::LegacyRenderWidgetHostHWND* legacy_render_widget_host_HWND_; |
| 811 #endif | 817 #endif |
| 812 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 818 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 813 }; | 819 }; |
| 814 | 820 |
| 815 } // namespace content | 821 } // namespace content |
| 816 | 822 |
| 817 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 823 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |