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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 226213002: Removes use_mojo (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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index dcc61ce738b1175e86d50048a733277364b3894e..e58ba47e125bb3472b297eda18137b340cec5a7e 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -697,24 +697,6 @@ void RenderViewHostImpl::SetHasPendingCrossSiteRequest(
GetProcess()->GetID(), GetRoutingID(), has_pending_request);
}
-#if defined(OS_ANDROID)
-void RenderViewHostImpl::ActivateNearestFindResult(int request_id,
- float x,
- float y) {
- Send(new InputMsg_ActivateNearestFindResult(GetRoutingID(),
- request_id, x, y));
-}
-
-void RenderViewHostImpl::RequestFindMatchRects(int current_version) {
- Send(new ViewMsg_FindMatchRects(GetRoutingID(), current_version));
-}
-
-void RenderViewHostImpl::DisableFullscreenEncryptedMediaPlayback() {
- media_player_manager_->DisableFullscreenEncryptedMediaPlayback();
-}
-#endif
-
-#if defined(USE_MOJO)
void RenderViewHostImpl::SetWebUIHandle(mojo::ScopedMessagePipeHandle handle) {
// Never grant any bindings to browser plugin guests.
if (GetProcess()->IsGuest()) {
@@ -732,6 +714,22 @@ void RenderViewHostImpl::SetWebUIHandle(mojo::ScopedMessagePipeHandle handle) {
static_cast<RenderProcessHostImpl*>(GetProcess());
process->SetWebUIHandle(GetRoutingID(), handle.Pass());
}
+
+#if defined(OS_ANDROID)
+void RenderViewHostImpl::ActivateNearestFindResult(int request_id,
+ float x,
+ float y) {
+ Send(new InputMsg_ActivateNearestFindResult(GetRoutingID(),
+ request_id, x, y));
+}
+
+void RenderViewHostImpl::RequestFindMatchRects(int current_version) {
+ Send(new ViewMsg_FindMatchRects(GetRoutingID(), current_version));
+}
+
+void RenderViewHostImpl::DisableFullscreenEncryptedMediaPlayback() {
+ media_player_manager_->DisableFullscreenEncryptedMediaPlayback();
+}
#endif
void RenderViewHostImpl::DragTargetDragEnter(
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/webui/web_ui_data_source_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698