| 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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 438     {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 438     {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 
| 439     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 439     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 
| 440      switches::kTopChromeMD, | 440      switches::kTopChromeMD, | 
| 441      switches::kTopChromeMDMaterial}, | 441      switches::kTopChromeMDMaterial}, | 
| 442     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 442     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 
| 443      switches::kTopChromeMD, | 443      switches::kTopChromeMD, | 
| 444      switches::kTopChromeMDMaterialHybrid}}; | 444      switches::kTopChromeMDMaterialHybrid}}; | 
| 445 #endif | 445 #endif | 
| 446 | 446 | 
| 447 #if defined(OS_CHROMEOS) | 447 #if defined(OS_CHROMEOS) | 
| 448 const Experiment::Choice kAshMaterialDesignInkDrop[] = { |  | 
| 449     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |  | 
| 450     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_CIRCLE, |  | 
| 451      switches::kMaterialDesignInkDrop, |  | 
| 452      switches::kMaterialDesignInkDropCircle}, |  | 
| 453     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_SQUARE, |  | 
| 454      switches::kMaterialDesignInkDrop, |  | 
| 455      switches::kMaterialDesignInkDropSquare}}; |  | 
| 456 | 448 | 
| 457 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 449 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 
| 458     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 450     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 
| 459     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 451     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 
| 460      switches::kMaterialDesignInkDropAnimationSpeed, | 452      switches::kMaterialDesignInkDropAnimationSpeed, | 
| 461      switches::kMaterialDesignInkDropAnimationSpeedFast}, | 453      switches::kMaterialDesignInkDropAnimationSpeedFast}, | 
| 462     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 454     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 
| 463      switches::kMaterialDesignInkDropAnimationSpeed, | 455      switches::kMaterialDesignInkDropAnimationSpeed, | 
| 464      switches::kMaterialDesignInkDropAnimationSpeedSlow}}; | 456      switches::kMaterialDesignInkDropAnimationSpeedSlow}}; | 
| 465 | 457 | 
| (...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1058     { | 1050     { | 
| 1059      "ash-stable-overview-order", | 1051      "ash-stable-overview-order", | 
| 1060      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, | 1052      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, | 
| 1061      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, | 1053      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, | 
| 1062      kOsCrOS, | 1054      kOsCrOS, | 
| 1063      ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, | 1055      ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, | 
| 1064                                ash::switches::kAshDisableStableOverviewOrder), | 1056                                ash::switches::kAshDisableStableOverviewOrder), | 
| 1065     }, | 1057     }, | 
| 1066 #endif  // defined(USE_ASH) | 1058 #endif  // defined(USE_ASH) | 
| 1067 #if defined(OS_CHROMEOS) | 1059 #if defined(OS_CHROMEOS) | 
| 1068     {"material-design-ink-drop", |  | 
| 1069      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_NAME, |  | 
| 1070      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_DESCRIPTION, |  | 
| 1071      kOsCrOS, |  | 
| 1072      MULTI_VALUE_TYPE(kAshMaterialDesignInkDrop)}, |  | 
| 1073     {"material-design-ink-drop-animation-speed", | 1060     {"material-design-ink-drop-animation-speed", | 
| 1074      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 1061      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 
| 1075      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, | 1062      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, | 
| 1076      kOsCrOS, | 1063      kOsCrOS, | 
| 1077      MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 1064      MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 
| 1078     {"disable-cloud-import", | 1065     {"disable-cloud-import", | 
| 1079      IDS_FLAGS_DISABLE_CLOUD_IMPORT, | 1066      IDS_FLAGS_DISABLE_CLOUD_IMPORT, | 
| 1080      IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, | 1067      IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, | 
| 1081      kOsCrOS, | 1068      kOsCrOS, | 
| 1082      SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, | 1069      SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, | 
| (...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2768 } | 2755 } | 
| 2769 | 2756 | 
| 2770 const Experiment* GetExperiments(size_t* count) { | 2757 const Experiment* GetExperiments(size_t* count) { | 
| 2771   *count = num_experiments; | 2758   *count = num_experiments; | 
| 2772   return experiments; | 2759   return experiments; | 
| 2773 } | 2760 } | 
| 2774 | 2761 | 
| 2775 }  // namespace testing | 2762 }  // namespace testing | 
| 2776 | 2763 | 
| 2777 }  // namespace about_flags | 2764 }  // namespace about_flags | 
| OLD | NEW | 
|---|