Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 346733003: Add experimental versions of the malware interstitial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweak to "not recommended" string Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL, 420 { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL,
421 switches::kSSLInterstitialVersionV2Colorful, "" }, 421 switches::kSSLInterstitialVersionV2Colorful, "" },
422 }; 422 };
423 423
424 // Using independent flags (instead of flag=value flags) to be able to 424 // Using independent flags (instead of flag=value flags) to be able to
425 // associate the version with a FieldTrial. FieldTrials don't currently support 425 // associate the version with a FieldTrial. FieldTrials don't currently support
426 // flag=value flags. 426 // flag=value flags.
427 const Experiment::Choice kMalwareInterstitialVersions[] = { 427 const Experiment::Choice kMalwareInterstitialVersions[] = {
428 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 428 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
429 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2, 429 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2,
430 switches::kMalwareInterstitialVersionV2, "" }, 430 switches::kMalwareInterstitialV2, "" },
431 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3, 431 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3,
432 switches::kMalwareInterstitialVersionV3, "" }, 432 switches::kMalwareInterstitialV3, "" },
433 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_ADVICE,
434 switches::kMalwareInterstitialV3Advice, "" },
435 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_SOCIAL,
436 switches::kMalwareInterstitialV3Social, "" },
437 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_NOTRECOMMEND,
438 switches::kMalwareInterstitialV3NotRecommend, "" },
439 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3_HISTORY,
440 switches::kMalwareInterstitialV3History, "" },
433 }; 441 };
434 442
435 #if defined(OS_CHROMEOS) 443 #if defined(OS_CHROMEOS)
436 const Experiment::Choice kEnableFileManagerMTPChoices[] = { 444 const Experiment::Choice kEnableFileManagerMTPChoices[] = {
437 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 445 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
438 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 446 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
439 chromeos::switches::kEnableFileManagerMTP, "true" }, 447 chromeos::switches::kEnableFileManagerMTP, "true" },
440 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 448 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
441 chromeos::switches::kEnableFileManagerMTP, "false" } 449 chromeos::switches::kEnableFileManagerMTP, "false" }
442 }; 450 };
(...skipping 2011 matching lines...) Expand 10 before | Expand all | Expand 10 after
2454 } 2462 }
2455 2463
2456 const Experiment* GetExperiments(size_t* count) { 2464 const Experiment* GetExperiments(size_t* count) {
2457 *count = num_experiments; 2465 *count = num_experiments;
2458 return experiments; 2466 return experiments;
2459 } 2467 }
2460 2468
2461 } // namespace testing 2469 } // namespace testing
2462 2470
2463 } // namespace about_flags 2471 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/safe_browsing/safe_browsing_v3.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698