Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 206923002: Adds plumbing to pass WebUI mojo::Handle from browser to renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 const GetAudioOutputControllersCallback& callback) const OVERRIDE; 233 const GetAudioOutputControllersCallback& callback) const OVERRIDE;
234 234
235 #if defined(OS_ANDROID) 235 #if defined(OS_ANDROID)
236 virtual void ActivateNearestFindResult(int request_id, 236 virtual void ActivateNearestFindResult(int request_id,
237 float x, 237 float x,
238 float y) OVERRIDE; 238 float y) OVERRIDE;
239 virtual void RequestFindMatchRects(int current_version) OVERRIDE; 239 virtual void RequestFindMatchRects(int current_version) OVERRIDE;
240 virtual void DisableFullscreenEncryptedMediaPlayback() OVERRIDE; 240 virtual void DisableFullscreenEncryptedMediaPlayback() OVERRIDE;
241 #endif 241 #endif
242 242
243 #if defined(USE_MOJO)
244 virtual void SetBrowserWebUIHandle(mojo::ScopedHandle handle) OVERRIDE;
245 #endif
246
243 void set_delegate(RenderViewHostDelegate* d) { 247 void set_delegate(RenderViewHostDelegate* d) {
244 CHECK(d); // http://crbug.com/82827 248 CHECK(d); // http://crbug.com/82827
245 delegate_ = d; 249 delegate_ = d;
246 } 250 }
247 251
248 // Set up the RenderView child process. Virtual because it is overridden by 252 // Set up the RenderView child process. Virtual because it is overridden by
249 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used 253 // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used
250 // as the name of the new top-level frame. 254 // as the name of the new top-level frame.
251 // The |opener_route_id| parameter indicates which RenderView created this 255 // The |opener_route_id| parameter indicates which RenderView created this
252 // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the 256 // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 735 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
732 }; 736 };
733 737
734 #if defined(COMPILER_MSVC) 738 #if defined(COMPILER_MSVC)
735 #pragma warning(pop) 739 #pragma warning(pop)
736 #endif 740 #endif
737 741
738 } // namespace content 742 } // namespace content
739 743
740 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 744 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698