| 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_CHILD_FRAME_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 9 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
| 10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 scoped_ptr<cc::CompositorFrame> frame) override; | 94 scoped_ptr<cc::CompositorFrame> frame) override; |
| 95 void GetScreenInfo(blink::WebScreenInfo* results) override; | 95 void GetScreenInfo(blink::WebScreenInfo* results) override; |
| 96 gfx::Rect GetBoundsInRootWindow() override; | 96 gfx::Rect GetBoundsInRootWindow() override; |
| 97 gfx::GLSurfaceHandle GetCompositingSurface() override; | 97 gfx::GLSurfaceHandle GetCompositingSurface() override; |
| 98 #if defined(USE_AURA) | 98 #if defined(USE_AURA) |
| 99 void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, | 99 void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, |
| 100 InputEventAckState ack_result) override; | 100 InputEventAckState ack_result) override; |
| 101 #endif // defined(USE_AURA) | 101 #endif // defined(USE_AURA) |
| 102 bool LockMouse() override; | 102 bool LockMouse() override; |
| 103 void UnlockMouse() override; | 103 void UnlockMouse() override; |
| 104 uint32_t GetSurfaceIdNamespace() override; |
| 104 | 105 |
| 105 #if defined(OS_MACOSX) | 106 #if defined(OS_MACOSX) |
| 106 // RenderWidgetHostView implementation. | 107 // RenderWidgetHostView implementation. |
| 107 void SetActive(bool active) override; | 108 void SetActive(bool active) override; |
| 108 void SetWindowVisibility(bool visible) override; | 109 void SetWindowVisibility(bool visible) override; |
| 109 void WindowFrameChanged() override; | 110 void WindowFrameChanged() override; |
| 110 void ShowDefinitionForSelection() override; | 111 void ShowDefinitionForSelection() override; |
| 111 bool SupportsSpeech() const override; | 112 bool SupportsSpeech() const override; |
| 112 void SpeakSelection() override; | 113 void SpeakSelection() override; |
| 113 bool IsSpeaking() const override; | 114 bool IsSpeaking() const override; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 // sent through it are routed to the embedding renderer process. | 149 // sent through it are routed to the embedding renderer process. |
| 149 CrossProcessFrameConnector* frame_connector_; | 150 CrossProcessFrameConnector* frame_connector_; |
| 150 | 151 |
| 151 private: | 152 private: |
| 152 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 153 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
| 153 }; | 154 }; |
| 154 | 155 |
| 155 } // namespace content | 156 } // namespace content |
| 156 | 157 |
| 157 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 158 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| OLD | NEW |