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 12 matching lines...) Expand all Loading... |
23 #include "chrome/common/chrome_content_client.h" | 23 #include "chrome/common/chrome_content_client.h" |
24 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/grit/generated_resources.h" | 25 #include "chrome/grit/generated_resources.h" |
26 #include "components/autofill/core/common/autofill_switches.h" | 26 #include "components/autofill/core/common/autofill_switches.h" |
27 #include "components/cloud_devices/common/cloud_devices_switches.h" | 27 #include "components/cloud_devices/common/cloud_devices_switches.h" |
28 #include "components/metrics/metrics_hashes.h" | 28 #include "components/metrics/metrics_hashes.h" |
29 #include "components/nacl/common/nacl_switches.h" | 29 #include "components/nacl/common/nacl_switches.h" |
30 #include "components/proximity_auth/switches.h" | 30 #include "components/proximity_auth/switches.h" |
31 #include "components/search/search_switches.h" | 31 #include "components/search/search_switches.h" |
32 #include "content/public/browser/user_metrics.h" | 32 #include "content/public/browser/user_metrics.h" |
| 33 #include "content/public/common/content_switches.h" |
33 #include "media/base/media_switches.h" | 34 #include "media/base/media_switches.h" |
34 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
35 #include "ui/base/ui_base_switches.h" | 36 #include "ui/base/ui_base_switches.h" |
36 #include "ui/display/display_switches.h" | 37 #include "ui/display/display_switches.h" |
37 #include "ui/events/event_switches.h" | 38 #include "ui/events/event_switches.h" |
38 #include "ui/gfx/switches.h" | 39 #include "ui/gfx/switches.h" |
39 #include "ui/gl/gl_switches.h" | 40 #include "ui/gl/gl_switches.h" |
40 #include "ui/keyboard/keyboard_switches.h" | 41 #include "ui/keyboard/keyboard_switches.h" |
41 #include "ui/native_theme/native_theme_switches.h" | 42 #include "ui/native_theme/native_theme_switches.h" |
42 #include "ui/views/views_switches.h" | 43 #include "ui/views/views_switches.h" |
(...skipping 2104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2147 }, | 2148 }, |
2148 #if defined(OS_CHROMEOS) | 2149 #if defined(OS_CHROMEOS) |
2149 { | 2150 { |
2150 "enable-timezone-tracking", | 2151 "enable-timezone-tracking", |
2151 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, | 2152 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, |
2152 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, | 2153 IDS_FLAGS_ENABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, |
2153 kOsCrOS, | 2154 kOsCrOS, |
2154 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) | 2155 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption) |
2155 }, | 2156 }, |
2156 #endif // defined(OS_CHROMEOS) | 2157 #endif // defined(OS_CHROMEOS) |
| 2158 { |
| 2159 "allow-insecure-localhost", |
| 2160 IDS_ALLOW_INSECURE_LOCALHOST, |
| 2161 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, |
| 2162 kOsAll, |
| 2163 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost) |
| 2164 }, |
2157 | 2165 |
2158 // NOTE: Adding new command-line switches requires adding corresponding | 2166 // NOTE: Adding new command-line switches requires adding corresponding |
2159 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2167 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2160 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2168 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2161 }; | 2169 }; |
2162 | 2170 |
2163 const Experiment* experiments = kExperiments; | 2171 const Experiment* experiments = kExperiments; |
2164 size_t num_experiments = arraysize(kExperiments); | 2172 size_t num_experiments = arraysize(kExperiments); |
2165 | 2173 |
2166 // Stores and encapsulates the little state that about:flags has. | 2174 // Stores and encapsulates the little state that about:flags has. |
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2726 } | 2734 } |
2727 | 2735 |
2728 const Experiment* GetExperiments(size_t* count) { | 2736 const Experiment* GetExperiments(size_t* count) { |
2729 *count = num_experiments; | 2737 *count = num_experiments; |
2730 return experiments; | 2738 return experiments; |
2731 } | 2739 } |
2732 | 2740 |
2733 } // namespace testing | 2741 } // namespace testing |
2734 | 2742 |
2735 } // namespace about_flags | 2743 } // namespace about_flags |
OLD | NEW |