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 3071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3082 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 3082 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
3083 {"enable-picture-in-picture", | 3083 {"enable-picture-in-picture", |
3084 flag_descriptions::kEnablePictureInPictureName, | 3084 flag_descriptions::kEnablePictureInPictureName, |
3085 flag_descriptions::kEnablePictureInPictureDescription, kOsDesktop, | 3085 flag_descriptions::kEnablePictureInPictureDescription, kOsDesktop, |
3086 SINGLE_VALUE_TYPE(switches::kEnablePictureInPicture)}, | 3086 SINGLE_VALUE_TYPE(switches::kEnablePictureInPicture)}, |
3087 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 3087 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
3088 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName, | 3088 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName, |
3089 flag_descriptions::kBrowserSideNavigationDescription, kOsAll, | 3089 flag_descriptions::kBrowserSideNavigationDescription, kOsAll, |
3090 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)}, | 3090 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)}, |
3091 | 3091 |
| 3092 #if defined(OS_MACOSX) |
| 3093 {"mac-touchbar", flag_descriptions::kMacTouchBarName, |
| 3094 flag_descriptions::kMacTouchBarDescription, kOsMac, |
| 3095 FEATURE_VALUE_TYPE(features::kBrowserTouchBar)}, |
| 3096 #endif // defined(OS_MACOSX) |
| 3097 |
3092 // NOTE: Adding new command-line switches requires adding corresponding | 3098 // NOTE: Adding new command-line switches requires adding corresponding |
3093 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 3099 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
3094 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 3100 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
3095 }; | 3101 }; |
3096 | 3102 |
3097 class FlagsStateSingleton { | 3103 class FlagsStateSingleton { |
3098 public: | 3104 public: |
3099 FlagsStateSingleton() | 3105 FlagsStateSingleton() |
3100 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 3106 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
3101 ~FlagsStateSingleton() {} | 3107 ~FlagsStateSingleton() {} |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3317 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3312 | 3318 |
3313 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3319 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3314 *count = arraysize(kFeatureEntries); | 3320 *count = arraysize(kFeatureEntries); |
3315 return kFeatureEntries; | 3321 return kFeatureEntries; |
3316 } | 3322 } |
3317 | 3323 |
3318 } // namespace testing | 3324 } // namespace testing |
3319 | 3325 |
3320 } // namespace about_flags | 3326 } // namespace about_flags |
OLD | NEW |