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 2874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2885 flag_descriptions::kCaptureThumbnailOnLoadFinishedName, | 2885 flag_descriptions::kCaptureThumbnailOnLoadFinishedName, |
2886 flag_descriptions::kCaptureThumbnailOnLoadFinishedDescription, kOsDesktop, | 2886 flag_descriptions::kCaptureThumbnailOnLoadFinishedDescription, kOsDesktop, |
2887 FEATURE_VALUE_TYPE(features::kCaptureThumbnailOnLoadFinished)}, | 2887 FEATURE_VALUE_TYPE(features::kCaptureThumbnailOnLoadFinished)}, |
2888 | 2888 |
2889 #if defined(OS_WIN) | 2889 #if defined(OS_WIN) |
2890 {"enable-d3d-vsync", flag_descriptions::kEnableD3DVsync, | 2890 {"enable-d3d-vsync", flag_descriptions::kEnableD3DVsync, |
2891 flag_descriptions::kEnableD3DVsyncDescription, kOsWin, | 2891 flag_descriptions::kEnableD3DVsyncDescription, kOsWin, |
2892 FEATURE_VALUE_TYPE(features::kD3DVsync)}, | 2892 FEATURE_VALUE_TYPE(features::kD3DVsync)}, |
2893 #endif // defined(OS_WIN) | 2893 #endif // defined(OS_WIN) |
2894 | 2894 |
| 2895 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2896 {"use-google-local-ntp", flag_descriptions::kUseGoogleLocalNtpName, |
| 2897 flag_descriptions::kUseGoogleLocalNtpDescription, kOsDesktop, |
| 2898 FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)}, |
| 2899 |
| 2900 {"one-google-bar-on-local-ntp", |
| 2901 flag_descriptions::kOneGoogleBarOnLocalNtpName, |
| 2902 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop, |
| 2903 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)}, |
| 2904 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| 2905 |
2895 // NOTE: Adding new command-line switches requires adding corresponding | 2906 // NOTE: Adding new command-line switches requires adding corresponding |
2896 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 2907 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
2897 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2908 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2898 }; | 2909 }; |
2899 | 2910 |
2900 class FlagsStateSingleton { | 2911 class FlagsStateSingleton { |
2901 public: | 2912 public: |
2902 FlagsStateSingleton() | 2913 FlagsStateSingleton() |
2903 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2914 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2904 ~FlagsStateSingleton() {} | 2915 ~FlagsStateSingleton() {} |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3110 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3121 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3111 | 3122 |
3112 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3123 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3113 *count = arraysize(kFeatureEntries); | 3124 *count = arraysize(kFeatureEntries); |
3114 return kFeatureEntries; | 3125 return kFeatureEntries; |
3115 } | 3126 } |
3116 | 3127 |
3117 } // namespace testing | 3128 } // namespace testing |
3118 | 3129 |
3119 } // namespace about_flags | 3130 } // namespace about_flags |
OLD | NEW |