| 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 "cc/resources/returned_resource.h" | 9 #include "cc/resources/returned_resource.h" |
| 10 #include "cc/surfaces/surface_factory_client.h" | 10 #include "cc/surfaces/surface_factory_client.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 void SpeakSelection() override; | 132 void SpeakSelection() override; |
| 133 bool IsSpeaking() const override; | 133 bool IsSpeaking() const override; |
| 134 void StopSpeaking() override; | 134 void StopSpeaking() override; |
| 135 | 135 |
| 136 // RenderWidgetHostViewBase implementation. | 136 // RenderWidgetHostViewBase implementation. |
| 137 bool PostProcessEventForPluginIme( | 137 bool PostProcessEventForPluginIme( |
| 138 const NativeWebKeyboardEvent& event) override; | 138 const NativeWebKeyboardEvent& event) override; |
| 139 #endif // defined(OS_MACOSX) | 139 #endif // defined(OS_MACOSX) |
| 140 | 140 |
| 141 // RenderWidgetHostViewBase implementation. | 141 // RenderWidgetHostViewBase implementation. |
| 142 #if defined(OS_ANDROID) | 142 #if defined(OS_ANDROID) && !defined(USE_AURA) |
| 143 void LockCompositingSurface() override; | 143 void LockCompositingSurface() override; |
| 144 void UnlockCompositingSurface() override; | 144 void UnlockCompositingSurface() override; |
| 145 #endif // defined(OS_ANDROID) | 145 #endif // defined(OS_ANDROID) |
| 146 | 146 |
| 147 #if defined(OS_WIN) | 147 #if defined(OS_WIN) |
| 148 void SetParentNativeViewAccessible( | 148 void SetParentNativeViewAccessible( |
| 149 gfx::NativeViewAccessible accessible_parent) override; | 149 gfx::NativeViewAccessible accessible_parent) override; |
| 150 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 150 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
| 151 #endif | 151 #endif |
| 152 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( | 152 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 } | 197 } |
| 198 | 198 |
| 199 private: | 199 private: |
| 200 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; | 200 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; |
| 201 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 201 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
| 202 }; | 202 }; |
| 203 | 203 |
| 204 } // namespace content | 204 } // namespace content |
| 205 | 205 |
| 206 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 206 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
| OLD | NEW |