| Index: content/browser/frame_host/frame_tree_node.cc
|
| diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
|
| index 180d8461cb00cc3d930b5a661e097aec6c34612b..bc044bcf8671fd806ecfdafe4126553881364b30 100644
|
| --- a/content/browser/frame_host/frame_tree_node.cc
|
| +++ b/content/browser/frame_host/frame_tree_node.cc
|
| @@ -6,11 +6,13 @@
|
|
|
| #include <queue>
|
|
|
| +#include "base/command_line.h"
|
| #include "base/stl_util.h"
|
| #include "content/browser/frame_host/frame_tree.h"
|
| #include "content/browser/frame_host/navigator.h"
|
| #include "content/browser/frame_host/render_frame_host_impl.h"
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| +#include "content/public/common/content_switches.h"
|
|
|
| namespace content {
|
|
|
| @@ -35,6 +37,10 @@ FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
|
| parent_(NULL) {}
|
|
|
| FrameTreeNode::~FrameTreeNode() {
|
| + if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableBrowserSideNavigation)) {
|
| + navigator_->CancelNavigation(this);
|
| + }
|
| }
|
|
|
| bool FrameTreeNode::IsMainFrame() const {
|
|
|