| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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) | 223 #if defined(OS_ANDROID) |
| 224 virtual void ActivateNearestFindResult(int request_id, | 224 virtual void ActivateNearestFindResult(int request_id, |
| 225 float x, | 225 float x, |
| 226 float y) OVERRIDE; | 226 float y) OVERRIDE; |
| 227 virtual void RequestFindMatchRects(int current_version) OVERRIDE; | 227 virtual void RequestFindMatchRects(int current_version) OVERRIDE; |
| 228 virtual void SynchronousFind(int request_id, |
| 229 const string16& search_text, |
| 230 const WebKit::WebFindOptions& options, |
| 231 int* match_count, |
| 232 int* active_ordinal) OVERRIDE; |
| 228 #endif | 233 #endif |
| 229 | 234 |
| 230 void set_delegate(RenderViewHostDelegate* d) { | 235 void set_delegate(RenderViewHostDelegate* d) { |
| 231 CHECK(d); // http://crbug.com/82827 | 236 CHECK(d); // http://crbug.com/82827 |
| 232 delegate_ = d; | 237 delegate_ = d; |
| 233 } | 238 } |
| 234 | 239 |
| 235 // Set up the RenderView child process. Virtual because it is overridden by | 240 // Set up the RenderView child process. Virtual because it is overridden by |
| 236 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used | 241 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used |
| 237 // as the name of the new top-level frame. | 242 // as the name of the new top-level frame. |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 683 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 679 }; | 684 }; |
| 680 | 685 |
| 681 #if defined(COMPILER_MSVC) | 686 #if defined(COMPILER_MSVC) |
| 682 #pragma warning(pop) | 687 #pragma warning(pop) |
| 683 #endif | 688 #endif |
| 684 | 689 |
| 685 } // namespace content | 690 } // namespace content |
| 686 | 691 |
| 687 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 692 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |