| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; | 217 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; |
| 218 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; | 218 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; |
| 219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, | 219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, |
| 220 const SkBitmap& zoomed_bitmap) override; | 220 const SkBitmap& zoomed_bitmap) override; |
| 221 bool LockMouse() override; | 221 bool LockMouse() override; |
| 222 void UnlockMouse() override; | 222 void UnlockMouse() override; |
| 223 void OnSwapCompositorFrame(uint32 output_surface_id, | 223 void OnSwapCompositorFrame(uint32 output_surface_id, |
| 224 scoped_ptr<cc::CompositorFrame> frame) override; | 224 scoped_ptr<cc::CompositorFrame> frame) override; |
| 225 void DidStopFlinging() override; | 225 void DidStopFlinging() override; |
| 226 void OnDidNavigateMainFrameToNewPage() override; | 226 void OnDidNavigateMainFrameToNewPage() override; |
| 227 uint32_t GetSurfaceIdNamespace() override; | |
| 228 | 227 |
| 229 #if defined(OS_WIN) | 228 #if defined(OS_WIN) |
| 230 void SetParentNativeViewAccessible( | 229 void SetParentNativeViewAccessible( |
| 231 gfx::NativeViewAccessible accessible_parent) override; | 230 gfx::NativeViewAccessible accessible_parent) override; |
| 232 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 231 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
| 233 #endif | 232 #endif |
| 234 | 233 |
| 235 // Overridden from ui::TextInputClient: | 234 // Overridden from ui::TextInputClient: |
| 236 void SetCompositionText(const ui::CompositionText& composition) override; | 235 void SetCompositionText(const ui::CompositionText& composition) override; |
| 237 void ConfirmCompositionText() override; | 236 void ConfirmCompositionText() override; |
| (...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 // compositing surface and showing the disambiguation popup. | 670 // compositing surface and showing the disambiguation popup. |
| 672 gfx::Vector2dF disambiguation_scroll_offset_; | 671 gfx::Vector2dF disambiguation_scroll_offset_; |
| 673 | 672 |
| 674 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 675 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 676 }; | 675 }; |
| 677 | 676 |
| 678 } // namespace content | 677 } // namespace content |
| 679 | 678 |
| 680 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |