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_features.h" |
9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
10 | 10 |
11 namespace content { | 11 namespace content { |
12 | 12 |
13 bool IsBrowserSideNavigationEnabled() { | 13 bool IsBrowserSideNavigationEnabled() { |
14 return | 14 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
15 base::CommandLine::ForCurrentProcess()->HasSwitch( | 15 switches::kEnableBrowserSideNavigation) || |
16 switches::kEnableBrowserSideNavigation) || | 16 base::FeatureList::IsEnabled(features::kBrowserSideNavigation) || |
17 base::FeatureList::IsEnabled(features::kBrowserSideNavigation); | 17 base::FeatureList::IsEnabled(features::kNetworkService); |
Alexei Svitkine (slow)
2017/06/29 13:58:24
Shouldn't this be () && net enabled?
Otherwise, i
jam
2017/06/30 17:21:18
Yep that's the intended behavior. Network Service
| |
18 } | 18 } |
19 | 19 |
20 } // namespace content | 20 } // namespace content |
OLD | NEW |