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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 563373002: Always activate MojoApplicationHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_, 275 Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_,
276 javascript, 276 javascript,
277 0, false)); 277 0, false));
278 } 278 }
279 279
280 RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() { 280 RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
281 return render_view_host_; 281 return render_view_host_;
282 } 282 }
283 283
284 ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() { 284 ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() {
285 static_cast<RenderProcessHostImpl*>(GetProcess())->EnsureMojoActivated();
286 return &service_registry_; 285 return &service_registry_;
287 } 286 }
288 287
289 bool RenderFrameHostImpl::Send(IPC::Message* message) { 288 bool RenderFrameHostImpl::Send(IPC::Message* message) {
290 if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) { 289 if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) {
291 return render_view_host_->input_router()->SendInput( 290 return render_view_host_->input_router()->SendInput(
292 make_scoped_ptr(message)); 291 make_scoped_ptr(message));
293 } 292 }
294 293
295 // Route IPCs through the RenderFrameProxyHost when in swapped out state. 294 // Route IPCs through the RenderFrameProxyHost when in swapped out state.
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 // Clear any state if a pending navigation is canceled or preempted. 1410 // Clear any state if a pending navigation is canceled or preempted.
1412 if (suspended_nav_params_) 1411 if (suspended_nav_params_)
1413 suspended_nav_params_.reset(); 1412 suspended_nav_params_.reset();
1414 1413
1415 TRACE_EVENT_ASYNC_END0("navigation", 1414 TRACE_EVENT_ASYNC_END0("navigation",
1416 "RenderFrameHostImpl navigation suspended", this); 1415 "RenderFrameHostImpl navigation suspended", this);
1417 navigations_suspended_ = false; 1416 navigations_suspended_ = false;
1418 } 1417 }
1419 1418
1420 } // namespace content 1419 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698