| 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 <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 void SetWebUIProperty(const std::string& name, | 164 void SetWebUIProperty(const std::string& name, |
| 165 const std::string& value) override; | 165 const std::string& value) override; |
| 166 void Zoom(PageZoom zoom) override; | 166 void Zoom(PageZoom zoom) override; |
| 167 void SyncRendererPrefs() override; | 167 void SyncRendererPrefs() override; |
| 168 WebPreferences GetWebkitPreferences() override; | 168 WebPreferences GetWebkitPreferences() override; |
| 169 void UpdateWebkitPreferences(const WebPreferences& prefs) override; | 169 void UpdateWebkitPreferences(const WebPreferences& prefs) override; |
| 170 void OnWebkitPreferencesChanged() override; | 170 void OnWebkitPreferencesChanged() override; |
| 171 void SelectWordAroundCaret() override; | 171 void SelectWordAroundCaret() override; |
| 172 | 172 |
| 173 #if defined(OS_ANDROID) | 173 #if defined(OS_ANDROID) |
| 174 virtual void ActivateNearestFindResult(int request_id, | 174 void ActivateNearestFindResult(int request_id, float x, float y) override; |
| 175 float x, | 175 void RequestFindMatchRects(int current_version) override; |
| 176 float y) override; | |
| 177 virtual void RequestFindMatchRects(int current_version) override; | |
| 178 #endif | 176 #endif |
| 179 | 177 |
| 180 void set_delegate(RenderViewHostDelegate* d) { | 178 void set_delegate(RenderViewHostDelegate* d) { |
| 181 CHECK(d); // http://crbug.com/82827 | 179 CHECK(d); // http://crbug.com/82827 |
| 182 delegate_ = d; | 180 delegate_ = d; |
| 183 } | 181 } |
| 184 | 182 |
| 185 // Set up the RenderView child process. Virtual because it is overridden by | 183 // Set up the RenderView child process. Virtual because it is overridden by |
| 186 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used | 184 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used |
| 187 // as the name of the new top-level frame. | 185 // as the name of the new top-level frame. |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 462 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 460 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 463 }; | 461 }; |
| 464 | 462 |
| 465 #if defined(COMPILER_MSVC) | 463 #if defined(COMPILER_MSVC) |
| 466 #pragma warning(pop) | 464 #pragma warning(pop) |
| 467 #endif | 465 #endif |
| 468 | 466 |
| 469 } // namespace content | 467 } // namespace content |
| 470 | 468 |
| 471 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 469 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |