| 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 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1050 // This message is only sent for top-level frames. TODO(avi): when frame tree | 1050 // This message is only sent for top-level frames. TODO(avi): when frame tree |
| 1051 // mirroring works correctly, add a check here to enforce it. | 1051 // mirroring works correctly, add a check here to enforce it. |
| 1052 delegate_->UpdateEncoding(this, encoding_name); | 1052 delegate_->UpdateEncoding(this, encoding_name); |
| 1053 } | 1053 } |
| 1054 | 1054 |
| 1055 void RenderFrameHostImpl::OnBeginNavigation( | 1055 void RenderFrameHostImpl::OnBeginNavigation( |
| 1056 const FrameHostMsg_BeginNavigation_Params& params, | 1056 const FrameHostMsg_BeginNavigation_Params& params, |
| 1057 const CommonNavigationParams& common_params) { | 1057 const CommonNavigationParams& common_params) { |
| 1058 CHECK(CommandLine::ForCurrentProcess()->HasSwitch( | 1058 CHECK(CommandLine::ForCurrentProcess()->HasSwitch( |
| 1059 switches::kEnableBrowserSideNavigation)); | 1059 switches::kEnableBrowserSideNavigation)); |
| 1060 frame_tree_node()->render_manager()->OnBeginNavigation(params, common_params); | 1060 frame_tree_node()->navigator()->OnBeginNavigation( |
| 1061 frame_tree_node(), params, common_params); |
| 1061 } | 1062 } |
| 1062 | 1063 |
| 1063 void RenderFrameHostImpl::OnAccessibilityEvents( | 1064 void RenderFrameHostImpl::OnAccessibilityEvents( |
| 1064 const std::vector<AccessibilityHostMsg_EventParams>& params) { | 1065 const std::vector<AccessibilityHostMsg_EventParams>& params) { |
| 1065 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( | 1066 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( |
| 1066 render_view_host_->GetView()); | 1067 render_view_host_->GetView()); |
| 1067 | 1068 |
| 1068 AccessibilityMode accessibility_mode = delegate_->GetAccessibilityMode(); | 1069 AccessibilityMode accessibility_mode = delegate_->GetAccessibilityMode(); |
| 1069 if ((accessibility_mode != AccessibilityModeOff) && view && | 1070 if ((accessibility_mode != AccessibilityModeOff) && view && |
| 1070 RenderFrameHostImpl::IsRFHStateActive(rfh_state())) { | 1071 RenderFrameHostImpl::IsRFHStateActive(rfh_state())) { |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1539 // Clear any state if a pending navigation is canceled or preempted. | 1540 // Clear any state if a pending navigation is canceled or preempted. |
| 1540 if (suspended_nav_params_) | 1541 if (suspended_nav_params_) |
| 1541 suspended_nav_params_.reset(); | 1542 suspended_nav_params_.reset(); |
| 1542 | 1543 |
| 1543 TRACE_EVENT_ASYNC_END0("navigation", | 1544 TRACE_EVENT_ASYNC_END0("navigation", |
| 1544 "RenderFrameHostImpl navigation suspended", this); | 1545 "RenderFrameHostImpl navigation suspended", this); |
| 1545 navigations_suspended_ = false; | 1546 navigations_suspended_ = false; |
| 1546 } | 1547 } |
| 1547 | 1548 |
| 1548 } // namespace content | 1549 } // namespace content |
| OLD | NEW |