| 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_VIEW_HOST_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 virtual void SetWebUIProperty(const std::string& name, | 213 virtual void SetWebUIProperty(const std::string& name, |
| 214 const std::string& value) OVERRIDE; | 214 const std::string& value) OVERRIDE; |
| 215 virtual void SetZoomLevel(double level) OVERRIDE; | 215 virtual void SetZoomLevel(double level) OVERRIDE; |
| 216 virtual void Zoom(PageZoom zoom) OVERRIDE; | 216 virtual void Zoom(PageZoom zoom) OVERRIDE; |
| 217 virtual void SyncRendererPrefs() OVERRIDE; | 217 virtual void SyncRendererPrefs() OVERRIDE; |
| 218 virtual void ToggleSpeechInput() OVERRIDE; | 218 virtual void ToggleSpeechInput() OVERRIDE; |
| 219 virtual webkit_glue::WebPreferences GetWebkitPreferences() OVERRIDE; | 219 virtual webkit_glue::WebPreferences GetWebkitPreferences() OVERRIDE; |
| 220 virtual void UpdateWebkitPreferences( | 220 virtual void UpdateWebkitPreferences( |
| 221 const webkit_glue::WebPreferences& prefs) OVERRIDE; | 221 const webkit_glue::WebPreferences& prefs) OVERRIDE; |
| 222 | 222 |
| 223 #if defined(OS_ANDROID) |
| 224 virtual void ActivateNearestFindResult(int request_id, |
| 225 float x, |
| 226 float y) OVERRIDE; |
| 227 virtual void RequestFindMatchRects(int current_version) OVERRIDE; |
| 228 #endif |
| 229 |
| 223 void set_delegate(RenderViewHostDelegate* d) { | 230 void set_delegate(RenderViewHostDelegate* d) { |
| 224 CHECK(d); // http://crbug.com/82827 | 231 CHECK(d); // http://crbug.com/82827 |
| 225 delegate_ = d; | 232 delegate_ = d; |
| 226 } | 233 } |
| 227 | 234 |
| 228 // Set up the RenderView child process. Virtual because it is overridden by | 235 // Set up the RenderView child process. Virtual because it is overridden by |
| 229 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used | 236 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used |
| 230 // as the name of the new top-level frame. | 237 // as the name of the new top-level frame. |
| 231 // The |opener_route_id| parameter indicates which RenderView created this | 238 // The |opener_route_id| parameter indicates which RenderView created this |
| 232 // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the | 239 // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the |
| (...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 673 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 667 }; | 674 }; |
| 668 | 675 |
| 669 #if defined(COMPILER_MSVC) | 676 #if defined(COMPILER_MSVC) |
| 670 #pragma warning(pop) | 677 #pragma warning(pop) |
| 671 #endif | 678 #endif |
| 672 | 679 |
| 673 } // namespace content | 680 } // namespace content |
| 674 | 681 |
| 675 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 682 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |