OLD | NEW |
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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_, | 309 Send(new FrameMsg_JavaScriptExecuteRequestForTests(routing_id_, |
310 javascript, | 310 javascript, |
311 0, false)); | 311 0, false)); |
312 } | 312 } |
313 | 313 |
314 RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() { | 314 RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() { |
315 return render_view_host_; | 315 return render_view_host_; |
316 } | 316 } |
317 | 317 |
318 ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() { | 318 ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() { |
319 static_cast<RenderProcessHostImpl*>(GetProcess())->EnsureMojoActivated(); | |
320 return &service_registry_; | 319 return &service_registry_; |
321 } | 320 } |
322 | 321 |
323 bool RenderFrameHostImpl::Send(IPC::Message* message) { | 322 bool RenderFrameHostImpl::Send(IPC::Message* message) { |
324 if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) { | 323 if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) { |
325 return render_view_host_->input_router()->SendInput( | 324 return render_view_host_->input_router()->SendInput( |
326 make_scoped_ptr(message)); | 325 make_scoped_ptr(message)); |
327 } | 326 } |
328 | 327 |
329 // Route IPCs through the RenderFrameProxyHost when in swapped out state. | 328 // Route IPCs through the RenderFrameProxyHost when in swapped out state. |
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1566 // Clear any state if a pending navigation is canceled or preempted. | 1565 // Clear any state if a pending navigation is canceled or preempted. |
1567 if (suspended_nav_params_) | 1566 if (suspended_nav_params_) |
1568 suspended_nav_params_.reset(); | 1567 suspended_nav_params_.reset(); |
1569 | 1568 |
1570 TRACE_EVENT_ASYNC_END0("navigation", | 1569 TRACE_EVENT_ASYNC_END0("navigation", |
1571 "RenderFrameHostImpl navigation suspended", this); | 1570 "RenderFrameHostImpl navigation suspended", this); |
1572 navigations_suspended_ = false; | 1571 navigations_suspended_ = false; |
1573 } | 1572 } |
1574 | 1573 |
1575 } // namespace content | 1574 } // namespace content |
OLD | NEW |