OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/public/common/browser_side_navigation_policy.h" | 5 #include "content/public/common/browser_side_navigation_policy.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/public/common/content_features.h" |
8 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
9 | 10 |
10 namespace content { | 11 namespace content { |
11 | 12 |
12 bool IsBrowserSideNavigationEnabled() { | 13 bool IsBrowserSideNavigationEnabled() { |
13 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 14 return |
14 switches::kEnableBrowserSideNavigation); | 15 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 16 switches::kEnableBrowserSideNavigation) || |
| 17 base::FeatureList::IsEnabled(features::kBrowserSideNavigation); |
15 } | 18 } |
16 | 19 |
17 } // namespace content | 20 } // namespace content |
OLD | NEW |