Index: content/browser/frame_host/render_frame_host_impl.cc |
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
index c9125d892d9ed031a150235e0f7d944e8720815a..f806156bb8a4f534a5459e1d4d8735e2ee4e9e54 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -5,6 +5,7 @@ |
#include "content/browser/frame_host/render_frame_host_impl.h" |
#include "base/bind.h" |
+#include "base/command_line.h" |
#include "base/containers/hash_tables.h" |
#include "base/lazy_instance.h" |
#include "base/metrics/user_metrics_action.h" |
@@ -44,6 +45,7 @@ |
#include "content/public/browser/render_widget_host_view.h" |
#include "content/public/browser/user_metrics.h" |
#include "content/public/common/content_constants.h" |
+#include "content/public/common/content_switches.h" |
#include "content/public/common/url_constants.h" |
#include "content/public/common/url_utils.h" |
#include "ui/accessibility/ax_tree.h" |
@@ -904,9 +906,9 @@ void RenderFrameHostImpl::OnUpdateEncoding(const std::string& encoding_name) { |
void RenderFrameHostImpl::OnBeginNavigation( |
const FrameHostMsg_BeginNavigation_Params& params) { |
-#if defined(USE_BROWSER_SIDE_NAVIGATION) |
- frame_tree_node()->render_manager()->OnBeginNavigation(params); |
-#endif |
+ CHECK(CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnableBrowserSideNavigation)); |
+ frame_tree_node()->navigator()->OnBeginNavigation(this, params); |
} |
void RenderFrameHostImpl::OnAccessibilityEvents( |