OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
6 | 6 |
7 #include <iterator> | 7 #include <iterator> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 3038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3049 flag_descriptions::kDisableNewVirtualKeyboardBehaviorDescription, kOsCrOS, | 3049 flag_descriptions::kDisableNewVirtualKeyboardBehaviorDescription, kOsCrOS, |
3050 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewVirtualKeyboardBehavior)}, | 3050 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewVirtualKeyboardBehavior)}, |
3051 #endif // defined(OS_CHROMEOS) | 3051 #endif // defined(OS_CHROMEOS) |
3052 | 3052 |
3053 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 3053 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
3054 {"enable-picture-in-picture", | 3054 {"enable-picture-in-picture", |
3055 flag_descriptions::kEnablePictureInPictureName, | 3055 flag_descriptions::kEnablePictureInPictureName, |
3056 flag_descriptions::kEnablePictureInPictureDescription, kOsDesktop, | 3056 flag_descriptions::kEnablePictureInPictureDescription, kOsDesktop, |
3057 SINGLE_VALUE_TYPE(switches::kEnablePictureInPicture)}, | 3057 SINGLE_VALUE_TYPE(switches::kEnablePictureInPicture)}, |
3058 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 3058 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| 3059 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName, |
| 3060 flag_descriptions::kBrowserSideNavigationDescription, kOsAll, |
| 3061 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)}, |
3059 | 3062 |
3060 // NOTE: Adding new command-line switches requires adding corresponding | 3063 // NOTE: Adding new command-line switches requires adding corresponding |
3061 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 3064 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
3062 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 3065 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
3063 }; | 3066 }; |
3064 | 3067 |
3065 class FlagsStateSingleton { | 3068 class FlagsStateSingleton { |
3066 public: | 3069 public: |
3067 FlagsStateSingleton() | 3070 FlagsStateSingleton() |
3068 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 3071 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3275 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3278 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3276 | 3279 |
3277 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3280 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3278 *count = arraysize(kFeatureEntries); | 3281 *count = arraysize(kFeatureEntries); |
3279 return kFeatureEntries; | 3282 return kFeatureEntries; |
3280 } | 3283 } |
3281 | 3284 |
3282 } // namespace testing | 3285 } // namespace testing |
3283 | 3286 |
3284 } // namespace about_flags | 3287 } // namespace about_flags |
OLD | NEW |