| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 const ViewHostMsg_SelectionBounds_Params& params) override; | 93 const ViewHostMsg_SelectionBounds_Params& params) override; |
| 94 void OnSwapCompositorFrame(uint32 output_surface_id, | 94 void OnSwapCompositorFrame(uint32 output_surface_id, |
| 95 scoped_ptr<cc::CompositorFrame> frame) override; | 95 scoped_ptr<cc::CompositorFrame> frame) override; |
| 96 #if defined(USE_AURA) | 96 #if defined(USE_AURA) |
| 97 void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, | 97 void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, |
| 98 InputEventAckState ack_result) override; | 98 InputEventAckState ack_result) override; |
| 99 #endif | 99 #endif |
| 100 bool LockMouse() override; | 100 bool LockMouse() override; |
| 101 void UnlockMouse() override; | 101 void UnlockMouse() override; |
| 102 void GetScreenInfo(blink::WebScreenInfo* results) override; | 102 void GetScreenInfo(blink::WebScreenInfo* results) override; |
| 103 uint32_t GetSurfaceIdNamespace() override; | |
| 104 | 103 |
| 105 #if defined(OS_MACOSX) | 104 #if defined(OS_MACOSX) |
| 106 // RenderWidgetHostView implementation. | 105 // RenderWidgetHostView implementation. |
| 107 void SetActive(bool active) override; | 106 void SetActive(bool active) override; |
| 108 void SetWindowVisibility(bool visible) override; | 107 void SetWindowVisibility(bool visible) override; |
| 109 void WindowFrameChanged() override; | 108 void WindowFrameChanged() override; |
| 110 void ShowDefinitionForSelection() override; | 109 void ShowDefinitionForSelection() override; |
| 111 bool SupportsSpeech() const override; | 110 bool SupportsSpeech() const override; |
| 112 void SpeakSelection() override; | 111 void SpeakSelection() override; |
| 113 bool IsSpeaking() const override; | 112 bool IsSpeaking() const override; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 base::WeakPtr<RenderWidgetHostViewBase> platform_view_; | 169 base::WeakPtr<RenderWidgetHostViewBase> platform_view_; |
| 171 #if defined(USE_AURA) | 170 #if defined(USE_AURA) |
| 172 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; | 171 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; |
| 173 #endif | 172 #endif |
| 174 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); | 173 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); |
| 175 }; | 174 }; |
| 176 | 175 |
| 177 } // namespace content | 176 } // namespace content |
| 178 | 177 |
| 179 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ | 178 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ |
| OLD | NEW |