| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 const GetAudioOutputControllersCallback& callback) const OVERRIDE; | 232 const GetAudioOutputControllersCallback& callback) const OVERRIDE; |
| 233 | 233 |
| 234 #if defined(OS_ANDROID) | 234 #if defined(OS_ANDROID) |
| 235 virtual void ActivateNearestFindResult(int request_id, | 235 virtual void ActivateNearestFindResult(int request_id, |
| 236 float x, | 236 float x, |
| 237 float y) OVERRIDE; | 237 float y) OVERRIDE; |
| 238 virtual void RequestFindMatchRects(int current_version) OVERRIDE; | 238 virtual void RequestFindMatchRects(int current_version) OVERRIDE; |
| 239 virtual void DisableFullscreenEncryptedMediaPlayback() OVERRIDE; | 239 virtual void DisableFullscreenEncryptedMediaPlayback() OVERRIDE; |
| 240 #endif | 240 #endif |
| 241 | 241 |
| 242 #if defined(USE_MOJO) | |
| 243 virtual void SetWebUIHandle(mojo::ScopedMessagePipeHandle handle) OVERRIDE; | |
| 244 #endif | |
| 245 | |
| 246 void set_delegate(RenderViewHostDelegate* d) { | 242 void set_delegate(RenderViewHostDelegate* d) { |
| 247 CHECK(d); // http://crbug.com/82827 | 243 CHECK(d); // http://crbug.com/82827 |
| 248 delegate_ = d; | 244 delegate_ = d; |
| 249 } | 245 } |
| 250 | 246 |
| 251 // Set up the RenderView child process. Virtual because it is overridden by | 247 // Set up the RenderView child process. Virtual because it is overridden by |
| 252 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used | 248 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used |
| 253 // as the name of the new top-level frame. | 249 // as the name of the new top-level frame. |
| 254 // The |opener_route_id| parameter indicates which RenderView created this | 250 // The |opener_route_id| parameter indicates which RenderView created this |
| 255 // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the | 251 // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); | 725 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); |
| 730 }; | 726 }; |
| 731 | 727 |
| 732 #if defined(COMPILER_MSVC) | 728 #if defined(COMPILER_MSVC) |
| 733 #pragma warning(pop) | 729 #pragma warning(pop) |
| 734 #endif | 730 #endif |
| 735 | 731 |
| 736 } // namespace content | 732 } // namespace content |
| 737 | 733 |
| 738 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ | 734 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ |
| OLD | NEW |