| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; | 178 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; |
| 179 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, | 179 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, |
| 180 const SkBitmap& zoomed_bitmap) override; | 180 const SkBitmap& zoomed_bitmap) override; |
| 181 bool LockMouse() override; | 181 bool LockMouse() override; |
| 182 void UnlockMouse() override; | 182 void UnlockMouse() override; |
| 183 void OnSwapCompositorFrame(uint32 output_surface_id, | 183 void OnSwapCompositorFrame(uint32 output_surface_id, |
| 184 scoped_ptr<cc::CompositorFrame> frame) override; | 184 scoped_ptr<cc::CompositorFrame> frame) override; |
| 185 void DidStopFlinging() override; | 185 void DidStopFlinging() override; |
| 186 void OnDidNavigateMainFrameToNewPage() override; | 186 void OnDidNavigateMainFrameToNewPage() override; |
| 187 uint32_t GetSurfaceIdNamespace() override; | 187 uint32_t GetSurfaceIdNamespace() override; |
| 188 uint32_t SurfaceIdNamespaceAtPoint(const gfx::Point& point) override; |
| 188 | 189 |
| 189 #if defined(OS_WIN) | 190 #if defined(OS_WIN) |
| 190 void SetParentNativeViewAccessible( | 191 void SetParentNativeViewAccessible( |
| 191 gfx::NativeViewAccessible accessible_parent) override; | 192 gfx::NativeViewAccessible accessible_parent) override; |
| 192 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 193 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
| 193 #endif | 194 #endif |
| 194 | 195 |
| 195 // Overridden from ui::TextInputClient: | 196 // Overridden from ui::TextInputClient: |
| 196 void SetCompositionText(const ui::CompositionText& composition) override; | 197 void SetCompositionText(const ui::CompositionText& composition) override; |
| 197 void ConfirmCompositionText() override; | 198 void ConfirmCompositionText() override; |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 | 660 |
| 660 BeginFrameObserverProxy begin_frame_observer_proxy_; | 661 BeginFrameObserverProxy begin_frame_observer_proxy_; |
| 661 | 662 |
| 662 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 663 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 663 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 664 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 664 }; | 665 }; |
| 665 | 666 |
| 666 } // namespace content | 667 } // namespace content |
| 667 | 668 |
| 668 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 669 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |