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

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

Issue 1298513003: Implemented prototype for new ink drop specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed most concerns from patch set 2. Created 5 years, 4 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
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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""}, 436 {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""},
437 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL, 437 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL,
438 switches::kTopChromeMD, 438 switches::kTopChromeMD,
439 switches::kTopChromeMDMaterial}, 439 switches::kTopChromeMDMaterial},
440 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID, 440 {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID,
441 switches::kTopChromeMD, 441 switches::kTopChromeMD,
442 switches::kTopChromeMDMaterialHybrid}}; 442 switches::kTopChromeMDMaterialHybrid}};
443 #endif 443 #endif
444 444
445 #if defined(OS_CHROMEOS) 445 #if defined(OS_CHROMEOS)
446 const Experiment::Choice kAshMaterialDesignInkDrop[] = {
447 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
448 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_CIRCLE,
449 switches::kMaterialDesignInkDrop,
450 switches::kMaterialDesignInkDropCircle},
451 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_SQUARE,
452 switches::kMaterialDesignInkDrop,
453 switches::kMaterialDesignInkDropSquare}};
454 446
455 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { 447 const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
456 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 448 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
457 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, 449 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST,
458 switches::kMaterialDesignInkDropAnimationSpeed, 450 switches::kMaterialDesignInkDropAnimationSpeed,
459 switches::kMaterialDesignInkDropAnimationSpeedFast}, 451 switches::kMaterialDesignInkDropAnimationSpeedFast},
460 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, 452 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW,
461 switches::kMaterialDesignInkDropAnimationSpeed, 453 switches::kMaterialDesignInkDropAnimationSpeed,
462 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; 454 switches::kMaterialDesignInkDropAnimationSpeedSlow}};
463 455
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 { 1053 {
1062 "ash-stable-overview-order", 1054 "ash-stable-overview-order",
1063 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, 1055 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME,
1064 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, 1056 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION,
1065 kOsCrOS, 1057 kOsCrOS,
1066 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder, 1058 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableStableOverviewOrder,
1067 ash::switches::kAshDisableStableOverviewOrder), 1059 ash::switches::kAshDisableStableOverviewOrder),
1068 }, 1060 },
1069 #endif // defined(USE_ASH) 1061 #endif // defined(USE_ASH)
1070 #if defined(OS_CHROMEOS) 1062 #if defined(OS_CHROMEOS)
1071 {"material-design-ink-drop",
1072 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_NAME,
1073 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_DESCRIPTION,
1074 kOsCrOS,
1075 MULTI_VALUE_TYPE(kAshMaterialDesignInkDrop)},
1076 {"material-design-ink-drop-animation-speed", 1063 {"material-design-ink-drop-animation-speed",
1077 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, 1064 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME,
1078 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, 1065 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION,
1079 kOsCrOS, 1066 kOsCrOS,
1080 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, 1067 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)},
1081 {"disable-cloud-import", 1068 {"disable-cloud-import",
1082 IDS_FLAGS_DISABLE_CLOUD_IMPORT, 1069 IDS_FLAGS_DISABLE_CLOUD_IMPORT,
1083 IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, 1070 IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION,
1084 kOsCrOS, 1071 kOsCrOS,
1085 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, 1072 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)},
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
2771 } 2758 }
2772 2759
2773 const Experiment* GetExperiments(size_t* count) { 2760 const Experiment* GetExperiments(size_t* count) {
2774 *count = num_experiments; 2761 *count = num_experiments;
2775 return experiments; 2762 return experiments;
2776 } 2763 }
2777 2764
2778 } // namespace testing 2765 } // namespace testing
2779 2766
2780 } // namespace about_flags 2767 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698