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 2127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2138 { | 2138 { |
2139 "enable-harfbuzz-rendertext", | 2139 "enable-harfbuzz-rendertext", |
2140 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME, | 2140 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME, |
2141 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION, | 2141 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
2142 kOsMac, | 2142 kOsMac, |
2143 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText) | 2143 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText) |
2144 }, | 2144 }, |
2145 #endif // defined(OS_MACOSX) | 2145 #endif // defined(OS_MACOSX) |
2146 #if defined(OS_CHROMEOS) | 2146 #if defined(OS_CHROMEOS) |
2147 { | 2147 { |
2148 "disable-timezone-tracking", | 2148 "enable-timezone-tracking", |
2149 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, | 2149 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
2150 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, | 2150 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
2151 kOsCrOS, | 2151 kOsCrOS, |
2152 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption) | 2152 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) |
2153 }, | 2153 }, |
2154 #endif // defined(OS_CHROMEOS) | 2154 #endif // defined(OS_CHROMEOS) |
2155 | 2155 |
2156 // NOTE: Adding new command-line switches requires adding corresponding | 2156 // NOTE: Adding new command-line switches requires adding corresponding |
2157 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2157 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2158 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2158 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2159 }; | 2159 }; |
2160 | 2160 |
2161 const Experiment* experiments = kExperiments; | 2161 const Experiment* experiments = kExperiments; |
2162 size_t num_experiments = arraysize(kExperiments); | 2162 size_t num_experiments = arraysize(kExperiments); |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2724 } | 2724 } |
2725 | 2725 |
2726 const Experiment* GetExperiments(size_t* count) { | 2726 const Experiment* GetExperiments(size_t* count) { |
2727 *count = num_experiments; | 2727 *count = num_experiments; |
2728 return experiments; | 2728 return experiments; |
2729 } | 2729 } |
2730 | 2730 |
2731 } // namespace testing | 2731 } // namespace testing |
2732 | 2732 |
2733 } // namespace about_flags | 2733 } // namespace about_flags |
OLD | NEW |