| 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 427     {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 427     {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 
| 428     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 428     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 
| 429      switches::kTopChromeMD, | 429      switches::kTopChromeMD, | 
| 430      switches::kTopChromeMDMaterial}, | 430      switches::kTopChromeMDMaterial}, | 
| 431     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 431     {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 
| 432      switches::kTopChromeMD, | 432      switches::kTopChromeMD, | 
| 433      switches::kTopChromeMDMaterialHybrid}}; | 433      switches::kTopChromeMDMaterialHybrid}}; | 
| 434 #endif | 434 #endif | 
| 435 | 435 | 
| 436 #if defined(OS_CHROMEOS) | 436 #if defined(OS_CHROMEOS) | 
| 437 const Experiment::Choice kAshMaterialDesignInkDrop[] = { |  | 
| 438     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |  | 
| 439     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_CIRCLE, |  | 
| 440      switches::kMaterialDesignInkDrop, |  | 
| 441      switches::kMaterialDesignInkDropCircle}, |  | 
| 442     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_SQUARE, |  | 
| 443      switches::kMaterialDesignInkDrop, |  | 
| 444      switches::kMaterialDesignInkDropSquare}}; |  | 
| 445 | 437 | 
| 446 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 438 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 
| 447     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 439     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 
| 448     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 440     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 
| 449      switches::kMaterialDesignInkDropAnimationSpeed, | 441      switches::kMaterialDesignInkDropAnimationSpeed, | 
| 450      switches::kMaterialDesignInkDropAnimationSpeedFast}, | 442      switches::kMaterialDesignInkDropAnimationSpeedFast}, | 
| 451     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 443     {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 
| 452      switches::kMaterialDesignInkDropAnimationSpeed, | 444      switches::kMaterialDesignInkDropAnimationSpeed, | 
| 453      switches::kMaterialDesignInkDropAnimationSpeedSlow}}; | 445      switches::kMaterialDesignInkDropAnimationSpeedSlow}}; | 
| 454 | 446 | 
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1025     { | 1017     { | 
| 1026      "ash-stable-overview-order", | 1018      "ash-stable-overview-order", | 
| 1027      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, | 1019      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, | 
| 1028      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, | 1020      IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, | 
| 1029      kOsCrOS, | 1021      kOsCrOS, | 
| 1030      ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, | 1022      ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, | 
| 1031                                ash::switches::kAshDisableStableOverviewOrder), | 1023                                ash::switches::kAshDisableStableOverviewOrder), | 
| 1032     }, | 1024     }, | 
| 1033 #endif  // defined(USE_ASH) | 1025 #endif  // defined(USE_ASH) | 
| 1034 #if defined(OS_CHROMEOS) | 1026 #if defined(OS_CHROMEOS) | 
| 1035     {"material-design-ink-drop", |  | 
| 1036      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_NAME, |  | 
| 1037      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_DESCRIPTION, |  | 
| 1038      kOsCrOS, |  | 
| 1039      MULTI_VALUE_TYPE(kAshMaterialDesignInkDrop)}, |  | 
| 1040     {"material-design-ink-drop-animation-speed", | 1027     {"material-design-ink-drop-animation-speed", | 
| 1041      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 1028      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 
| 1042      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, | 1029      IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, | 
| 1043      kOsCrOS, | 1030      kOsCrOS, | 
| 1044      MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 1031      MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 
| 1045     {"disable-cloud-import", | 1032     {"disable-cloud-import", | 
| 1046      IDS_FLAGS_DISABLE_CLOUD_IMPORT, | 1033      IDS_FLAGS_DISABLE_CLOUD_IMPORT, | 
| 1047      IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, | 1034      IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, | 
| 1048      kOsCrOS, | 1035      kOsCrOS, | 
| 1049      SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, | 1036      SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, | 
| (...skipping 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2722 } | 2709 } | 
| 2723 | 2710 | 
| 2724 const Experiment* GetExperiments(size_t* count) { | 2711 const Experiment* GetExperiments(size_t* count) { | 
| 2725   *count = num_experiments; | 2712   *count = num_experiments; | 
| 2726   return experiments; | 2713   return experiments; | 
| 2727 } | 2714 } | 
| 2728 | 2715 | 
| 2729 }  // namespace testing | 2716 }  // namespace testing | 
| 2730 | 2717 | 
| 2731 }  // namespace about_flags | 2718 }  // namespace about_flags | 
| OLD | NEW | 
|---|