| 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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 426 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 427 switches::kEnableAnswersInSuggest, ""}, | 427 switches::kEnableAnswersInSuggest, ""}, |
| 428 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 428 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 429 switches::kDisableAnswersInSuggest, ""} | 429 switches::kDisableAnswersInSuggest, ""} |
| 430 }; | 430 }; |
| 431 #endif | 431 #endif |
| 432 | 432 |
| 433 // Using independent flags (instead of flag=value flags) to be able to | 433 // Using independent flags (instead of flag=value flags) to be able to |
| 434 // associate the version with a FieldTrial. FieldTrials don't currently support | 434 // associate the version with a FieldTrial. FieldTrials don't currently support |
| 435 // flag=value flags. | 435 // flag=value flags. |
| 436 const Experiment::Choice kSSLInterstitialVersions[] = { | |
| 437 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 438 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1, | |
| 439 switches::kSSLInterstitialV1, "" }, | |
| 440 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY, | |
| 441 switches::kSSLInterstitialV2, "" }, | |
| 442 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL, | |
| 443 switches::kSSLInterstitialV2Yellow, "" }, | |
| 444 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_GUARD, | |
| 445 switches::kSSLInterstitialV2Guard, "" }, | |
| 446 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1_V2, | |
| 447 switches::kSSLInterstitialV1WithV2Text, "" }, | |
| 448 }; | |
| 449 | |
| 450 // Using independent flags (instead of flag=value flags) to be able to | |
| 451 // associate the version with a FieldTrial. FieldTrials don't currently support | |
| 452 // flag=value flags. | |
| 453 const Experiment::Choice kMalwareInterstitialVersions[] = { | 436 const Experiment::Choice kMalwareInterstitialVersions[] = { |
| 454 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 437 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 455 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2, | 438 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2, |
| 456 switches::kMalwareInterstitialV2, "" }, | 439 switches::kMalwareInterstitialV2, "" }, |
| 457 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3, | 440 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3, |
| 458 switches::kMalwareInterstitialV3, "" }, | 441 switches::kMalwareInterstitialV3, "" }, |
| 459 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_ADVICE, | 442 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_ADVICE, |
| 460 switches::kMalwareInterstitialV3Advice, "" }, | 443 switches::kMalwareInterstitialV3Advice, "" }, |
| 461 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_SOCIAL, | 444 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_SOCIAL, |
| 462 switches::kMalwareInterstitialV3Social, "" }, | 445 switches::kMalwareInterstitialV3Social, "" }, |
| (...skipping 1385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1848 #if defined(OS_ANDROID) | 1831 #if defined(OS_ANDROID) |
| 1849 { | 1832 { |
| 1850 "answers-in-suggest", | 1833 "answers-in-suggest", |
| 1851 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, | 1834 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME, |
| 1852 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, | 1835 IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION, |
| 1853 kOsAndroid, | 1836 kOsAndroid, |
| 1854 MULTI_VALUE_TYPE(kAnswersInSuggestChoices) | 1837 MULTI_VALUE_TYPE(kAnswersInSuggestChoices) |
| 1855 }, | 1838 }, |
| 1856 #endif | 1839 #endif |
| 1857 { | 1840 { |
| 1858 "ssl-interstitial-version", | |
| 1859 IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_NAME, | |
| 1860 IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_DESCRIPTION, | |
| 1861 kOsAll, | |
| 1862 MULTI_VALUE_TYPE(kSSLInterstitialVersions) | |
| 1863 }, | |
| 1864 { | |
| 1865 "malware-interstitial-version", | 1841 "malware-interstitial-version", |
| 1866 IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_NAME, | 1842 IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_NAME, |
| 1867 IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_DESCRIPTION, | 1843 IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_DESCRIPTION, |
| 1868 kOsAll, | 1844 kOsAll, |
| 1869 MULTI_VALUE_TYPE(kMalwareInterstitialVersions) | 1845 MULTI_VALUE_TYPE(kMalwareInterstitialVersions) |
| 1870 }, | 1846 }, |
| 1871 #if defined(OS_ANDROID) | 1847 #if defined(OS_ANDROID) |
| 1872 { | 1848 { |
| 1873 "enable-data-reduction-proxy-dev", | 1849 "enable-data-reduction-proxy-dev", |
| 1874 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME, | 1850 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME, |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2423 } | 2399 } |
| 2424 | 2400 |
| 2425 const Experiment* GetExperiments(size_t* count) { | 2401 const Experiment* GetExperiments(size_t* count) { |
| 2426 *count = num_experiments; | 2402 *count = num_experiments; |
| 2427 return experiments; | 2403 return experiments; |
| 2428 } | 2404 } |
| 2429 | 2405 |
| 2430 } // namespace testing | 2406 } // namespace testing |
| 2431 | 2407 |
| 2432 } // namespace about_flags | 2408 } // namespace about_flags |
| OLD | NEW |