| 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 <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "ui/aura/window_delegate.h" | 35 #include "ui/aura/window_delegate.h" |
| 36 #include "ui/base/ime/text_input_client.h" | 36 #include "ui/base/ime/text_input_client.h" |
| 37 #include "ui/compositor/compositor.h" | 37 #include "ui/compositor/compositor.h" |
| 38 #include "ui/compositor/compositor_observer.h" | 38 #include "ui/compositor/compositor_observer.h" |
| 39 #include "ui/gfx/display_observer.h" | 39 #include "ui/gfx/display_observer.h" |
| 40 #include "ui/gfx/rect.h" | 40 #include "ui/gfx/rect.h" |
| 41 #include "webkit/common/cursors/webcursor.h" | 41 #include "webkit/common/cursors/webcursor.h" |
| 42 | 42 |
| 43 namespace aura { | 43 namespace aura { |
| 44 class WindowTracker; | 44 class WindowTracker; |
| 45 namespace client { |
| 46 class ScopedTooltipDisabler; |
| 47 } |
| 45 } | 48 } |
| 46 | 49 |
| 47 namespace cc { | 50 namespace cc { |
| 48 class CopyOutputResult; | 51 class CopyOutputResult; |
| 49 class DelegatedFrameData; | 52 class DelegatedFrameData; |
| 50 } | 53 } |
| 51 | 54 |
| 52 namespace gfx { | 55 namespace gfx { |
| 53 class Canvas; | 56 class Canvas; |
| 54 class Display; | 57 class Display; |
| (...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 | 776 |
| 774 struct ReleasedFrameInfo { | 777 struct ReleasedFrameInfo { |
| 775 ReleasedFrameInfo(uint32 output_id, unsigned software_frame_id) | 778 ReleasedFrameInfo(uint32 output_id, unsigned software_frame_id) |
| 776 : output_surface_id(output_id), frame_id(software_frame_id) {} | 779 : output_surface_id(output_id), frame_id(software_frame_id) {} |
| 777 uint32 output_surface_id; | 780 uint32 output_surface_id; |
| 778 unsigned frame_id; | 781 unsigned frame_id; |
| 779 }; | 782 }; |
| 780 scoped_ptr<ReleasedFrameInfo> released_software_frame_; | 783 scoped_ptr<ReleasedFrameInfo> released_software_frame_; |
| 781 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; | 784 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; |
| 782 | 785 |
| 786 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; |
| 787 |
| 783 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 788 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 784 | 789 |
| 785 #if defined(OS_WIN) | 790 #if defined(OS_WIN) |
| 786 // The dummy HWND which corresponds to the bounds of the web page. This is | 791 // The dummy HWND which corresponds to the bounds of the web page. This is |
| 787 // passed to windowless plugins like Flash/Silverlight, etc as the | 792 // passed to windowless plugins like Flash/Silverlight, etc as the |
| 788 // container window. | 793 // container window. |
| 789 HWND plugin_parent_window_; | 794 HWND plugin_parent_window_; |
| 790 #endif | 795 #endif |
| 791 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 796 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 792 }; | 797 }; |
| 793 | 798 |
| 794 } // namespace content | 799 } // namespace content |
| 795 | 800 |
| 796 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 801 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |