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 20 matching lines...) Expand all Loading... | |
31 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 31 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
32 #include "content/browser/renderer_host/render_view_host_impl.h" | 32 #include "content/browser/renderer_host/render_view_host_impl.h" |
33 #include "content/browser/renderer_host/render_widget_host_impl.h" | 33 #include "content/browser/renderer_host/render_widget_host_impl.h" |
34 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 34 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
35 #include "content/browser/transition_request_manager.h" | 35 #include "content/browser/transition_request_manager.h" |
36 #include "content/common/accessibility_messages.h" | 36 #include "content/common/accessibility_messages.h" |
37 #include "content/common/desktop_notification_messages.h" | 37 #include "content/common/desktop_notification_messages.h" |
38 #include "content/common/frame_messages.h" | 38 #include "content/common/frame_messages.h" |
39 #include "content/common/input_messages.h" | 39 #include "content/common/input_messages.h" |
40 #include "content/common/inter_process_time_ticks_converter.h" | 40 #include "content/common/inter_process_time_ticks_converter.h" |
41 #include "content/common/navigation_params.h" | |
41 #include "content/common/platform_notification_messages.h" | 42 #include "content/common/platform_notification_messages.h" |
42 #include "content/common/render_frame_setup.mojom.h" | 43 #include "content/common/render_frame_setup.mojom.h" |
43 #include "content/common/swapped_out_messages.h" | 44 #include "content/common/swapped_out_messages.h" |
44 #include "content/public/browser/ax_event_notification_details.h" | 45 #include "content/public/browser/ax_event_notification_details.h" |
45 #include "content/public/browser/browser_accessibility_state.h" | 46 #include "content/public/browser/browser_accessibility_state.h" |
46 #include "content/public/browser/browser_context.h" | 47 #include "content/public/browser/browser_context.h" |
47 #include "content/public/browser/browser_plugin_guest_manager.h" | 48 #include "content/public/browser/browser_plugin_guest_manager.h" |
48 #include "content/public/browser/browser_thread.h" | 49 #include "content/public/browser/browser_thread.h" |
49 #include "content/public/browser/content_browser_client.h" | 50 #include "content/public/browser/content_browser_client.h" |
50 #include "content/public/browser/desktop_notification_delegate.h" | 51 #include "content/public/browser/desktop_notification_delegate.h" |
(...skipping 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1372 // correctly while waiting for a response. | 1373 // correctly while waiting for a response. |
1373 if (is_waiting && dialog_was_suppressed) | 1374 if (is_waiting && dialog_was_suppressed) |
1374 render_view_host_->delegate_->RendererUnresponsive(render_view_host_); | 1375 render_view_host_->delegate_->RendererUnresponsive(render_view_host_); |
1375 } | 1376 } |
1376 | 1377 |
1377 void RenderFrameHostImpl::NotificationClosed(int notification_id) { | 1378 void RenderFrameHostImpl::NotificationClosed(int notification_id) { |
1378 cancel_notification_callbacks_.erase(notification_id); | 1379 cancel_notification_callbacks_.erase(notification_id); |
1379 } | 1380 } |
1380 | 1381 |
1381 // PlzNavigate | 1382 // PlzNavigate |
1383 void RenderFrameHostImpl::RequestNavigation( | |
1384 const CommonNavigationParams& common_params, | |
1385 const RequestNavigationParams& request_params) { | |
1386 Send(new FrameMsg_RequestNavigation( | |
nasko
2014/10/08 17:40:32
Do we forsee this method growing in size? If not,
clamy
2014/10/10 02:33:11
Done.
| |
1387 routing_id_, common_params, request_params)); | |
1388 } | |
1389 | |
1390 // PlzNavigate | |
1382 void RenderFrameHostImpl::CommitNavigation( | 1391 void RenderFrameHostImpl::CommitNavigation( |
1383 ResourceResponse* response, | 1392 ResourceResponse* response, |
1384 scoped_ptr<StreamHandle> body, | 1393 scoped_ptr<StreamHandle> body, |
1385 const CommonNavigationParams& common_params, | 1394 const CommonNavigationParams& common_params, |
1386 const CommitNavigationParams& commit_params) { | 1395 const CommitNavigationParams& commit_params) { |
1387 // TODO(clamy): Check if we have to add security checks for the browser plugin | 1396 // TODO(clamy): Check if we have to add security checks for the browser plugin |
1388 // guests. | 1397 // guests. |
1389 | 1398 |
1390 Send(new FrameMsg_CommitNavigation( | 1399 Send(new FrameMsg_CommitNavigation( |
1391 routing_id_, response->head, body->GetURL(), | 1400 routing_id_, response->head, body->GetURL(), |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1548 // Clear any state if a pending navigation is canceled or preempted. | 1557 // Clear any state if a pending navigation is canceled or preempted. |
1549 if (suspended_nav_params_) | 1558 if (suspended_nav_params_) |
1550 suspended_nav_params_.reset(); | 1559 suspended_nav_params_.reset(); |
1551 | 1560 |
1552 TRACE_EVENT_ASYNC_END0("navigation", | 1561 TRACE_EVENT_ASYNC_END0("navigation", |
1553 "RenderFrameHostImpl navigation suspended", this); | 1562 "RenderFrameHostImpl navigation suspended", this); |
1554 navigations_suspended_ = false; | 1563 navigations_suspended_ = false; |
1555 } | 1564 } |
1556 | 1565 |
1557 } // namespace content | 1566 } // namespace content |
OLD | NEW |