| 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 virtual void ToggleSpeechInput() OVERRIDE; | 221 virtual void ToggleSpeechInput() OVERRIDE; |
| 222 virtual webkit_glue::WebPreferences GetWebkitPreferences() OVERRIDE; | 222 virtual webkit_glue::WebPreferences GetWebkitPreferences() OVERRIDE; |
| 223 virtual void UpdateWebkitPreferences( | 223 virtual void UpdateWebkitPreferences( |
| 224 const webkit_glue::WebPreferences& prefs) OVERRIDE; | 224 const webkit_glue::WebPreferences& prefs) OVERRIDE; |
| 225 | 225 |
| 226 #if defined(OS_ANDROID) | 226 #if defined(OS_ANDROID) |
| 227 virtual void ActivateNearestFindResult(int request_id, | 227 virtual void ActivateNearestFindResult(int request_id, |
| 228 float x, | 228 float x, |
| 229 float y) OVERRIDE; | 229 float y) OVERRIDE; |
| 230 virtual void RequestFindMatchRects(int current_version) OVERRIDE; | 230 virtual void RequestFindMatchRects(int current_version) OVERRIDE; |
| 231 virtual void SynchronousFind(int request_id, |
| 232 const string16& search_text, |
| 233 const WebKit::WebFindOptions& options, |
| 234 int* match_count, |
| 235 int* active_ordinal) OVERRIDE; |
| 231 #endif | 236 #endif |
| 232 | 237 |
| 233 void set_delegate(RenderViewHostDelegate* d) { | 238 void set_delegate(RenderViewHostDelegate* d) { |
| 234 CHECK(d); // http://crbug.com/82827 | 239 CHECK(d); // http://crbug.com/82827 |
| 235 delegate_ = d; | 240 delegate_ = d; |
| 236 } | 241 } |
| 237 | 242 |
| 238 // Set up the RenderView child process. Virtual because it is overridden by | 243 // Set up the RenderView child process. Virtual because it is overridden by |
| 239 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used | 244 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used |
| 240 // as the name of the new top-level frame. | 245 // as the name of the new top-level frame. |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 696 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 692 }; | 697 }; |
| 693 | 698 |
| 694 #if defined(COMPILER_MSVC) | 699 #if defined(COMPILER_MSVC) |
| 695 #pragma warning(pop) | 700 #pragma warning(pop) |
| 696 #endif | 701 #endif |
| 697 | 702 |
| 698 } // namespace content | 703 } // namespace content |
| 699 | 704 |
| 700 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 705 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |