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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 extensions::switches::kExtensionContentVerification, | 407 extensions::switches::kExtensionContentVerification, |
408 extensions::switches::kExtensionContentVerificationEnforceStrict }, | 408 extensions::switches::kExtensionContentVerificationEnforceStrict }, |
409 }; | 409 }; |
410 | 410 |
411 // Using independent flags (instead of flag=value flags) to be able to | 411 // Using independent flags (instead of flag=value flags) to be able to |
412 // associate the version with a FieldTrial. FieldTrials don't currently support | 412 // associate the version with a FieldTrial. FieldTrials don't currently support |
413 // flag=value flags. | 413 // flag=value flags. |
414 const Experiment::Choice kSSLInterstitialVersions[] = { | 414 const Experiment::Choice kSSLInterstitialVersions[] = { |
415 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 415 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
416 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1, | 416 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1, |
417 switches::kSSLInterstitialVersionV1, "" }, | 417 switches::kSSLInterstitialV1, "" }, |
418 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY, | 418 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY, |
419 switches::kSSLInterstitialVersionV2Gray, "" }, | 419 switches::kSSLInterstitialV2, "" }, |
420 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL, | 420 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL, |
421 switches::kSSLInterstitialVersionV2Colorful, "" }, | 421 switches::kSSLInterstitialV2Yellow, "" }, |
| 422 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_GUARD, |
| 423 switches::kSSLInterstitialV2Guard, "" }, |
| 424 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1_V2, |
| 425 switches::kSSLInterstitialV1WithV2Text, "" }, |
422 }; | 426 }; |
423 | 427 |
424 // Using independent flags (instead of flag=value flags) to be able to | 428 // Using independent flags (instead of flag=value flags) to be able to |
425 // associate the version with a FieldTrial. FieldTrials don't currently support | 429 // associate the version with a FieldTrial. FieldTrials don't currently support |
426 // flag=value flags. | 430 // flag=value flags. |
427 const Experiment::Choice kMalwareInterstitialVersions[] = { | 431 const Experiment::Choice kMalwareInterstitialVersions[] = { |
428 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 432 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
429 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2, | 433 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2, |
430 switches::kMalwareInterstitialV2, "" }, | 434 switches::kMalwareInterstitialV2, "" }, |
431 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3, | 435 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3, |
(...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2469 } | 2473 } |
2470 | 2474 |
2471 const Experiment* GetExperiments(size_t* count) { | 2475 const Experiment* GetExperiments(size_t* count) { |
2472 *count = num_experiments; | 2476 *count = num_experiments; |
2473 return experiments; | 2477 return experiments; |
2474 } | 2478 } |
2475 | 2479 |
2476 } // namespace testing | 2480 } // namespace testing |
2477 | 2481 |
2478 } // namespace about_flags | 2482 } // namespace about_flags |
OLD | NEW |