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 2256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2267 }, | 2267 }, |
2268 { | 2268 { |
2269 "use-sync-sandbox", | 2269 "use-sync-sandbox", |
2270 IDS_FLAGS_SYNC_SANDBOX_NAME, | 2270 IDS_FLAGS_SYNC_SANDBOX_NAME, |
2271 IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, | 2271 IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, |
2272 kOsAll, | 2272 kOsAll, |
2273 SINGLE_VALUE_TYPE_AND_VALUE( | 2273 SINGLE_VALUE_TYPE_AND_VALUE( |
2274 switches::kSyncServiceURL, | 2274 switches::kSyncServiceURL, |
2275 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha") | 2275 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha") |
2276 }, | 2276 }, |
2277 | |
please use gerrit instead
2015/06/04 19:41:05
Remove this line to preserve the conventions of th
Julius
2015/06/05 03:41:12
Done.
| |
2277 { | 2278 { |
2278 "enable-child-account-detection", | 2279 "enable-child-account-detection", |
2279 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, | 2280 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, |
2280 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, | 2281 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, |
2281 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, | 2282 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
2282 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, | 2283 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, |
2283 switches::kDisableChildAccountDetection) | 2284 switches::kDisableChildAccountDetection) |
2284 }, | 2285 }, |
2285 #if defined(OS_CHROMEOS) && defined(USE_OZONE) | 2286 #if defined(OS_CHROMEOS) && defined(USE_OZONE) |
2286 { | 2287 { |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2389 SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts) | 2390 SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts) |
2390 }, | 2391 }, |
2391 #endif | 2392 #endif |
2392 { | 2393 { |
2393 "emphasize-titles-in-omnibox-dropdown", | 2394 "emphasize-titles-in-omnibox-dropdown", |
2394 IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_NAME, | 2395 IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_NAME, |
2395 IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_DESCRIPTION, | 2396 IDS_FLAGS_EMPHASIZE_TITLES_IN_OMNIBOX_DROPDOWN_DESCRIPTION, |
2396 kOsAll, | 2397 kOsAll, |
2397 SINGLE_VALUE_TYPE(switches::kEmphasizeTitlesInOmniboxDropdown) | 2398 SINGLE_VALUE_TYPE(switches::kEmphasizeTitlesInOmniboxDropdown) |
2398 }, | 2399 }, |
2400 | |
please use gerrit instead
2015/06/04 19:41:05
Remove this line to preserve the conventions of th
Julius
2015/06/05 03:41:12
Done.
| |
2399 #if defined(ENABLE_WEBRTC) | 2401 #if defined(ENABLE_WEBRTC) |
2400 { | 2402 { |
2401 "enable-webrtc-dtls12", | 2403 "enable-webrtc-dtls12", |
2402 IDS_FLAGS_ENABLE_WEBRTC_DTLS12_NAME, | 2404 IDS_FLAGS_ENABLE_WEBRTC_DTLS12_NAME, |
2403 IDS_FLAGS_ENABLE_WEBRTC_DTLS12_DESCRIPTION, | 2405 IDS_FLAGS_ENABLE_WEBRTC_DTLS12_DESCRIPTION, |
2404 kOsAll, | 2406 kOsAll, |
2405 SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12) | 2407 SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12) |
2406 }, | 2408 }, |
2407 #endif | 2409 #endif |
2408 #if defined(OS_MACOSX) | 2410 #if defined(OS_MACOSX) |
2409 { | 2411 { |
2410 "app-info-dialog", | 2412 "app-info-dialog", |
2411 IDS_FLAGS_APP_INFO_DIALOG_NAME, | 2413 IDS_FLAGS_APP_INFO_DIALOG_NAME, |
2412 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, | 2414 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, |
2413 kOsMac, | 2415 kOsMac, |
2414 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, | 2416 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, |
2415 switches::kDisableAppInfoDialogMac) | 2417 switches::kDisableAppInfoDialogMac) |
2416 }, | 2418 }, |
2417 #endif | 2419 #endif |
2420 | |
please use gerrit instead
2015/06/04 19:41:05
Remove this line to preserve the conventions of th
Julius
2015/06/05 03:41:12
Done.
| |
2421 #if defined(ENABLE_SPELLCHECK) && \ | |
2422 (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)) | |
2423 { | |
2424 "enable-multilingual-spellchecker", | |
2425 IDS_FLAGS_ENABLE_MULTILINGUAL_SPELLCHECKER_NAME, | |
2426 IDS_FLAGS_ENABLE_MULTILINGUAL_SPELLCHECKER_DESCRIPTION, | |
2427 kOsWin | kOsLinux | kOsCrOS, | |
2428 SINGLE_VALUE_TYPE(switches::kEnableMultilingualSpellChecker) | |
2429 }, | |
2430 #endif // defined(ENABLE_SPELLCHECK) && (defined(OS_LINUX) || defined(OS_WIN) | |
please use gerrit instead
2015/06/04 19:41:05
Remove the " // defined..." after #endif to prese
Julius
2015/06/05 03:41:11
Done.
| |
2431 // || defined(OS_CHROMEOS)) | |
2432 | |
2418 // NOTE: Adding new command-line switches requires adding corresponding | 2433 // NOTE: Adding new command-line switches requires adding corresponding |
2419 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2434 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2420 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2435 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2421 }; | 2436 }; |
2422 | 2437 |
2423 const Experiment* experiments = kExperiments; | 2438 const Experiment* experiments = kExperiments; |
2424 size_t num_experiments = arraysize(kExperiments); | 2439 size_t num_experiments = arraysize(kExperiments); |
2425 | 2440 |
2426 // Stores and encapsulates the little state that about:flags has. | 2441 // Stores and encapsulates the little state that about:flags has. |
2427 class FlagsState { | 2442 class FlagsState { |
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3005 } | 3020 } |
3006 | 3021 |
3007 const Experiment* GetExperiments(size_t* count) { | 3022 const Experiment* GetExperiments(size_t* count) { |
3008 *count = num_experiments; | 3023 *count = num_experiments; |
3009 return experiments; | 3024 return experiments; |
3010 } | 3025 } |
3011 | 3026 |
3012 } // namespace testing | 3027 } // namespace testing |
3013 | 3028 |
3014 } // namespace about_flags | 3029 } // namespace about_flags |
OLD | NEW |