diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 05:27:09 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 05:27:09 +0000 |
| commit | 544471a24bef5e8f57855a268aa48b25efbda9bc (patch) | |
| tree | fe12425ca94180f3928c5b0c30ffcb587f30cafd /chrome/browser/about_flags.cc | |
| parent | 7e41600e634d1509541d110a46153bf94ba8a3f5 (diff) | |
| download | chromium_src-544471a24bef5e8f57855a268aa48b25efbda9bc.zip chromium_src-544471a24bef5e8f57855a268aa48b25efbda9bc.tar.gz chromium_src-544471a24bef5e8f57855a268aa48b25efbda9bc.tar.bz2 | |
Replace extension_switch_utils.h with feature_switch.h.
BUG=135503
TBR=jhawkins@chromium.org
Review URL: https://codereview.chromium.org/11030042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
| -rw-r--r-- | chrome/browser/about_flags.cc | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 4190d5b..59708a0 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -160,6 +160,22 @@ const Experiment::Choice kNaClDebugMaskChoices[] = { switches::kNaClDebugMask, "*://*/*debug.nmf" } }; +const Experiment::Choice kActionBoxChoices[] = { + { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, + { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, + switches::kActionBox, "0"}, + { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, + switches::kActionBox, "1"} +}; + +const Experiment::Choice kScriptBubbleChoices[] = { + { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, + { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, + switches::kScriptBubble, "0"}, + { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, + switches::kScriptBubble, "1"} +}; + #if defined(OS_CHROMEOS) const Experiment::Choice kAshBootAnimationFunction[] = { { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, @@ -400,18 +416,25 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) }, { - "disable-action-box", + "action-box", IDS_FLAGS_ACTION_BOX_NAME, IDS_FLAGS_ACTION_BOX_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kDisableActionBox), + MULTI_VALUE_TYPE(kActionBoxChoices), }, { "script-badges", IDS_FLAGS_SCRIPT_BADGES_NAME, IDS_FLAGS_SCRIPT_BADGES_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kEnableScriptBadges), + SINGLE_VALUE_TYPE(switches::kScriptBadges) + }, + { + "script-bubble", + IDS_FLAGS_SCRIPT_BUBBLE_NAME, + IDS_FLAGS_SCRIPT_BUBBLE_DESCRIPTION, + kOsAll, + MULTI_VALUE_TYPE(kScriptBubbleChoices), }, { "apps-new-install-bubble", |