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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 BrowserAccessibilityDelegate* delegate) override; | 218 BrowserAccessibilityDelegate* delegate) override; |
219 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; | 219 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; |
220 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; | 220 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; |
221 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, | 221 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, |
222 const SkBitmap& zoomed_bitmap) override; | 222 const SkBitmap& zoomed_bitmap) override; |
223 bool LockMouse() override; | 223 bool LockMouse() override; |
224 void UnlockMouse() override; | 224 void UnlockMouse() override; |
225 void OnSwapCompositorFrame(uint32 output_surface_id, | 225 void OnSwapCompositorFrame(uint32 output_surface_id, |
226 scoped_ptr<cc::CompositorFrame> frame) override; | 226 scoped_ptr<cc::CompositorFrame> frame) override; |
227 void DidStopFlinging() override; | 227 void DidStopFlinging() override; |
| 228 void ResetGestureDetection() override; |
228 | 229 |
229 #if defined(OS_WIN) | 230 #if defined(OS_WIN) |
230 virtual void SetParentNativeViewAccessible( | 231 virtual void SetParentNativeViewAccessible( |
231 gfx::NativeViewAccessible accessible_parent) override; | 232 gfx::NativeViewAccessible accessible_parent) override; |
232 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 233 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
233 #endif | 234 #endif |
234 | 235 |
235 // Overridden from ui::TextInputClient: | 236 // Overridden from ui::TextInputClient: |
236 void SetCompositionText(const ui::CompositionText& composition) override; | 237 void SetCompositionText(const ui::CompositionText& composition) override; |
237 void ConfirmCompositionText() override; | 238 void ConfirmCompositionText() override; |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
636 // compositing surface and showing the disambiguation popup. | 637 // compositing surface and showing the disambiguation popup. |
637 gfx::Vector2dF disambiguation_scroll_offset_; | 638 gfx::Vector2dF disambiguation_scroll_offset_; |
638 | 639 |
639 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 640 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
640 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 641 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
641 }; | 642 }; |
642 | 643 |
643 } // namespace content | 644 } // namespace content |
644 | 645 |
645 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 646 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |