| 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 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2130 { | 2130 { |
| 2131 "enable-harfbuzz-rendertext", | 2131 "enable-harfbuzz-rendertext", |
| 2132 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME, | 2132 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME, |
| 2133 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION, | 2133 IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION, |
| 2134 kOsMac, | 2134 kOsMac, |
| 2135 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText) | 2135 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText) |
| 2136 }, | 2136 }, |
| 2137 #endif // defined(OS_MACOSX) | 2137 #endif // defined(OS_MACOSX) |
| 2138 #if defined(OS_CHROMEOS) | 2138 #if defined(OS_CHROMEOS) |
| 2139 { | 2139 { |
| 2140 "enable-timezone-tracking", | 2140 "disable-timezone-tracking", |
| 2141 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, | 2141 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
| 2142 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, | 2142 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
| 2143 kOsCrOS, | 2143 kOsCrOS, |
| 2144 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) | 2144 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption) |
| 2145 }, | 2145 }, |
| 2146 #endif // defined(OS_CHROMEOS) | 2146 #endif // defined(OS_CHROMEOS) |
| 2147 | 2147 |
| 2148 // NOTE: Adding new command-line switches requires adding corresponding | 2148 // NOTE: Adding new command-line switches requires adding corresponding |
| 2149 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2149 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2150 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2150 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2151 }; | 2151 }; |
| 2152 | 2152 |
| 2153 const Experiment* experiments = kExperiments; | 2153 const Experiment* experiments = kExperiments; |
| 2154 size_t num_experiments = arraysize(kExperiments); | 2154 size_t num_experiments = arraysize(kExperiments); |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2716 } | 2716 } |
| 2717 | 2717 |
| 2718 const Experiment* GetExperiments(size_t* count) { | 2718 const Experiment* GetExperiments(size_t* count) { |
| 2719 *count = num_experiments; | 2719 *count = num_experiments; |
| 2720 return experiments; | 2720 return experiments; |
| 2721 } | 2721 } |
| 2722 | 2722 |
| 2723 } // namespace testing | 2723 } // namespace testing |
| 2724 | 2724 |
| 2725 } // namespace about_flags | 2725 } // namespace about_flags |
| OLD | NEW |