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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 OnDidNavigateMainFrameToNewPage() override; | 228 void OnDidNavigateMainFrameToNewPage() override; |
229 uint32_t GetSurfaceIdNamespace() override; | 229 uint32_t GetSurfaceIdNamespace() override; |
| 230 uint32_t SurfaceIdNamespaceAtPoint(const gfx::Point& point, |
| 231 gfx::Point* transformed_point) override; |
230 | 232 |
231 #if defined(OS_WIN) | 233 #if defined(OS_WIN) |
232 void SetParentNativeViewAccessible( | 234 void SetParentNativeViewAccessible( |
233 gfx::NativeViewAccessible accessible_parent) override; | 235 gfx::NativeViewAccessible accessible_parent) override; |
234 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 236 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
235 #endif | 237 #endif |
236 | 238 |
237 // Overridden from ui::TextInputClient: | 239 // Overridden from ui::TextInputClient: |
238 void SetCompositionText(const ui::CompositionText& composition) override; | 240 void SetCompositionText(const ui::CompositionText& composition) override; |
239 void ConfirmCompositionText() override; | 241 void ConfirmCompositionText() override; |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 | 673 |
672 BeginFrameObserverProxy begin_frame_observer_proxy_; | 674 BeginFrameObserverProxy begin_frame_observer_proxy_; |
673 | 675 |
674 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 676 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
675 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 677 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
676 }; | 678 }; |
677 | 679 |
678 } // namespace content | 680 } // namespace content |
679 | 681 |
680 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 682 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |