| 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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, | 412 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, |
| 413 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, | 413 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, |
| 414 switches::kTopChromeMD, | 414 switches::kTopChromeMD, |
| 415 switches::kTopChromeMDMaterial}, | 415 switches::kTopChromeMDMaterial}, |
| 416 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, | 416 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, |
| 417 switches::kTopChromeMD, | 417 switches::kTopChromeMD, |
| 418 switches::kTopChromeMDMaterialHybrid}}; | 418 switches::kTopChromeMDMaterialHybrid}}; |
| 419 #endif | 419 #endif |
| 420 | 420 |
| 421 #if defined(OS_CHROMEOS) | 421 #if defined(OS_CHROMEOS) |
| 422 const Experiment::Choice kAshMaterialDesignInkDrop[] = { | |
| 423 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | |
| 424 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_CIRCLE, | |
| 425 switches::kMaterialDesignInkDrop, | |
| 426 switches::kMaterialDesignInkDropCircle}, | |
| 427 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_SQUARE, | |
| 428 switches::kMaterialDesignInkDrop, | |
| 429 switches::kMaterialDesignInkDropSquare}}; | |
| 430 | 422 |
| 431 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { | 423 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { |
| 432 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, | 424 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
| 433 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, | 425 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, |
| 434 switches::kMaterialDesignInkDropAnimationSpeed, | 426 switches::kMaterialDesignInkDropAnimationSpeed, |
| 435 switches::kMaterialDesignInkDropAnimationSpeedFast}, | 427 switches::kMaterialDesignInkDropAnimationSpeedFast}, |
| 436 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, | 428 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, |
| 437 switches::kMaterialDesignInkDropAnimationSpeed, | 429 switches::kMaterialDesignInkDropAnimationSpeed, |
| 438 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; | 430 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; |
| 439 | 431 |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1012 { | 1004 { |
| 1013 "ash-stable-overview-order", | 1005 "ash-stable-overview-order", |
| 1014 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, | 1006 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, |
| 1015 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, | 1007 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, |
| 1016 kOsCrOS, | 1008 kOsCrOS, |
| 1017 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, | 1009 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, |
| 1018 ash::switches::kAshDisableStableOverviewOrder), | 1010 ash::switches::kAshDisableStableOverviewOrder), |
| 1019 }, | 1011 }, |
| 1020 #endif // defined(USE_ASH) | 1012 #endif // defined(USE_ASH) |
| 1021 #if defined(OS_CHROMEOS) | 1013 #if defined(OS_CHROMEOS) |
| 1022 {"material-design-ink-drop", | |
| 1023 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_NAME, | |
| 1024 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_DESCRIPTION, | |
| 1025 kOsCrOS, | |
| 1026 MULTI_VALUE_TYPE(kAshMaterialDesignInkDrop)}, | |
| 1027 {"material-design-ink-drop-animation-speed", | 1014 {"material-design-ink-drop-animation-speed", |
| 1028 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, | 1015 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, |
| 1029 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, | 1016 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, |
| 1030 kOsCrOS, | 1017 kOsCrOS, |
| 1031 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, | 1018 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, |
| 1032 {"disable-cloud-import", | 1019 {"disable-cloud-import", |
| 1033 IDS_FLAGS_DISABLE_CLOUD_IMPORT, | 1020 IDS_FLAGS_DISABLE_CLOUD_IMPORT, |
| 1034 IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, | 1021 IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, |
| 1035 kOsCrOS, | 1022 kOsCrOS, |
| 1036 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, | 1023 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, |
| (...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2716 } | 2703 } |
| 2717 | 2704 |
| 2718 const Experiment* GetExperiments(size_t* count) { | 2705 const Experiment* GetExperiments(size_t* count) { |
| 2719 *count = num_experiments; | 2706 *count = num_experiments; |
| 2720 return experiments; | 2707 return experiments; |
| 2721 } | 2708 } |
| 2722 | 2709 |
| 2723 } // namespace testing | 2710 } // namespace testing |
| 2724 | 2711 |
| 2725 } // namespace about_flags | 2712 } // namespace about_flags |
| OLD | NEW |