| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 virtual bool SupportsSpeech() const OVERRIDE; | 130 virtual bool SupportsSpeech() const OVERRIDE; |
| 131 virtual void SpeakSelection() OVERRIDE; | 131 virtual void SpeakSelection() OVERRIDE; |
| 132 virtual bool IsSpeaking() const OVERRIDE; | 132 virtual bool IsSpeaking() const OVERRIDE; |
| 133 virtual void StopSpeaking() OVERRIDE; | 133 virtual void StopSpeaking() OVERRIDE; |
| 134 | 134 |
| 135 // RenderWidgetHostViewBase implementation. | 135 // RenderWidgetHostViewBase implementation. |
| 136 virtual bool PostProcessEventForPluginIme( | 136 virtual bool PostProcessEventForPluginIme( |
| 137 const NativeWebKeyboardEvent& event) OVERRIDE; | 137 const NativeWebKeyboardEvent& event) OVERRIDE; |
| 138 #endif // defined(OS_MACOSX) | 138 #endif // defined(OS_MACOSX) |
| 139 | 139 |
| 140 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) | 140 #if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA) |
| 141 // RenderWidgetHostViewBase implementation. | 141 // RenderWidgetHostViewBase implementation. |
| 142 virtual void ShowDisambiguationPopup( | 142 virtual void ShowDisambiguationPopup( |
| 143 const gfx::Rect& rect_pixels, | 143 const gfx::Rect& rect_pixels, |
| 144 const SkBitmap& zoomed_bitmap) OVERRIDE; | 144 const SkBitmap& zoomed_bitmap) OVERRIDE; |
| 145 #endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) | 145 #endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) |
| 146 | 146 |
| 147 #if defined(OS_ANDROID) | 147 #if defined(OS_ANDROID) |
| 148 virtual void LockCompositingSurface() OVERRIDE; | 148 virtual void LockCompositingSurface() OVERRIDE; |
| 149 virtual void UnlockCompositingSurface() OVERRIDE; | 149 virtual void UnlockCompositingSurface() OVERRIDE; |
| 150 #endif // defined(OS_ANDROID) | 150 #endif // defined(OS_ANDROID) |
| (...skipping 22 matching lines...) Expand all Loading... |
| 173 // sent through it are routed to the embedding renderer process. | 173 // sent through it are routed to the embedding renderer process. |
| 174 CrossProcessFrameConnector* frame_connector_; | 174 CrossProcessFrameConnector* frame_connector_; |
| 175 | 175 |
| 176 private: | 176 private: |
| 177 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 177 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
| 178 }; | 178 }; |
| 179 | 179 |
| 180 } // namespace content | 180 } // namespace content |
| 181 | 181 |
| 182 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 182 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| OLD | NEW |