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 <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 virtual void SetBackground(const SkBitmap& background) OVERRIDE; | 70 virtual void SetBackground(const SkBitmap& background) OVERRIDE; |
71 | 71 |
72 // Overridden from RenderWidgetHostViewPort: | 72 // Overridden from RenderWidgetHostViewPort: |
73 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, | 73 virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, |
74 const gfx::Rect& pos) OVERRIDE; | 74 const gfx::Rect& pos) OVERRIDE; |
75 virtual void InitAsFullscreen( | 75 virtual void InitAsFullscreen( |
76 RenderWidgetHostView* reference_host_view) OVERRIDE; | 76 RenderWidgetHostView* reference_host_view) OVERRIDE; |
77 virtual void WasShown() OVERRIDE; | 77 virtual void WasShown() OVERRIDE; |
78 virtual void WasHidden() OVERRIDE; | 78 virtual void WasHidden() OVERRIDE; |
79 virtual void MovePluginWindows( | 79 virtual void MovePluginWindows( |
| 80 const gfx::Point& scroll_offset, |
80 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE; | 81 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE; |
81 virtual void Focus() OVERRIDE; | 82 virtual void Focus() OVERRIDE; |
82 virtual void Blur() OVERRIDE; | 83 virtual void Blur() OVERRIDE; |
83 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE; | 84 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE; |
84 virtual void SetIsLoading(bool is_loading) OVERRIDE; | 85 virtual void SetIsLoading(bool is_loading) OVERRIDE; |
85 virtual void TextInputStateChanged( | 86 virtual void TextInputStateChanged( |
86 const ViewHostMsg_TextInputState_Params& params) OVERRIDE; | 87 const ViewHostMsg_TextInputState_Params& params) OVERRIDE; |
87 virtual void ImeCancelComposition() OVERRIDE; | 88 virtual void ImeCancelComposition() OVERRIDE; |
88 virtual void ImeCompositionRangeChanged( | 89 virtual void ImeCompositionRangeChanged( |
89 const ui::Range& range, | 90 const ui::Range& range, |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 | 379 |
379 // This lock is for waiting for a front surface to become available to draw. | 380 // This lock is for waiting for a front surface to become available to draw. |
380 scoped_refptr<aura::CompositorLock> released_front_lock_; | 381 scoped_refptr<aura::CompositorLock> released_front_lock_; |
381 | 382 |
382 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 383 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
383 }; | 384 }; |
384 | 385 |
385 } // namespace content | 386 } // namespace content |
386 | 387 |
387 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 388 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |