| 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 2136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2147 | 2147 |
| 2148 { | 2148 { |
| 2149 "enable-site-per-process", | 2149 "enable-site-per-process", |
| 2150 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME, | 2150 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME, |
| 2151 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_DESCRIPTION, | 2151 IDS_FLAGS_ENABLE_SITE_PER_PROCESS_DESCRIPTION, |
| 2152 kOsAll, | 2152 kOsAll, |
| 2153 SINGLE_VALUE_TYPE(switches::kSitePerProcess) | 2153 SINGLE_VALUE_TYPE(switches::kSitePerProcess) |
| 2154 }, | 2154 }, |
| 2155 #if defined(OS_CHROMEOS) | 2155 #if defined(OS_CHROMEOS) |
| 2156 { | 2156 { |
| 2157 "enable-timezone-tracking", | 2157 "disable-timezone-tracking", |
| 2158 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, | 2158 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
| 2159 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, | 2159 IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
| 2160 kOsCrOS, | 2160 kOsCrOS, |
| 2161 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) | 2161 SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption) |
| 2162 }, | 2162 }, |
| 2163 #endif // defined(OS_CHROMEOS) | 2163 #endif // defined(OS_CHROMEOS) |
| 2164 | 2164 |
| 2165 // NOTE: Adding new command-line switches requires adding corresponding | 2165 // NOTE: Adding new command-line switches requires adding corresponding |
| 2166 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2166 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2167 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2167 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2168 }; | 2168 }; |
| 2169 | 2169 |
| 2170 const Experiment* experiments = kExperiments; | 2170 const Experiment* experiments = kExperiments; |
| 2171 size_t num_experiments = arraysize(kExperiments); | 2171 size_t num_experiments = arraysize(kExperiments); |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2733 } | 2733 } |
| 2734 | 2734 |
| 2735 const Experiment* GetExperiments(size_t* count) { | 2735 const Experiment* GetExperiments(size_t* count) { |
| 2736 *count = num_experiments; | 2736 *count = num_experiments; |
| 2737 return experiments; | 2737 return experiments; |
| 2738 } | 2738 } |
| 2739 | 2739 |
| 2740 } // namespace testing | 2740 } // namespace testing |
| 2741 | 2741 |
| 2742 } // namespace about_flags | 2742 } // namespace about_flags |
| OLD | NEW |