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 72dcc54196c110723416dacfaa8dc14141c6723a..870aeeccbdfadcdc2d43e439624b5943ba23c6a5 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" |
@@ -43,6 +44,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" |
@@ -852,9 +854,10 @@ 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 |
+ if (CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnableBrowserSideNavigation)) { |
+ frame_tree_node()->render_manager()->OnBeginNavigation(params); |
+ } |
} |
void RenderFrameHostImpl::OnAccessibilityEvents( |