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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/toolbar/back_button.cc » ('j') | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d481a23de51d4dff18f6c5dc07f5016d77ec715f..90a91217c6e0b267c0e6a08ba6229154366838b7 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -443,14 +443,6 @@ const Experiment::Choice kTopChromeMaterialDesignChoices[] = {
#endif
#if defined(OS_CHROMEOS)
-const Experiment::Choice kAshMaterialDesignInkDrop[] = {
- {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
- {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_CIRCLE,
- switches::kMaterialDesignInkDrop,
- switches::kMaterialDesignInkDropCircle},
- {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_SQUARE,
- switches::kMaterialDesignInkDrop,
- switches::kMaterialDesignInkDropSquare}};
const Experiment::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
{IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
@@ -1068,11 +1060,6 @@ const Experiment kExperiments[] = {
},
#endif // defined(USE_ASH)
#if defined(OS_CHROMEOS)
- {"material-design-ink-drop",
- IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_NAME,
- IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_DESCRIPTION,
- kOsCrOS,
- MULTI_VALUE_TYPE(kAshMaterialDesignInkDrop)},
{"material-design-ink-drop-animation-speed",
IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME,
IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/toolbar/back_button.cc » ('j') | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698