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

Unified Diff: chrome/browser/about_flags.cc

Issue 10960034: [cros] Go back to EASE_OUT for boot transition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 8 years, 3 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') | ui/base/animation/tween.h » ('j') | no next file with comments »
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 fa38d14ba1cf403251d9d8a5cf9e1b9685c6b9b4..db989a8efe423c63b0a6ffd2f63fdaaa98cf8d4a 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -149,6 +149,16 @@ const Experiment::Choice kAsyncDnsChoices[] = {
switches::kEnableAsyncDns, ""}
};
+#if defined(OS_CHROMEOS)
+const Experiment::Choice kAshBootAnimationFunction[] = {
+ { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+ { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2,
+ ash::switches::kAshBootAnimationFunction2, ""},
+ { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3,
+ ash::switches::kAshBootAnimationFunction3, ""}
+};
+#endif
+
// RECORDING USER METRICS FOR FLAGS:
// -----------------------------------------------------------------------------
@@ -835,6 +845,13 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2),
},
{
+ "boot-animation-fucntion",
+ IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION,
+ IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION,
+ kOsCrOS,
+ MULTI_VALUE_TYPE(kAshBootAnimationFunction),
+ },
+ {
"disable-workspace2",
IDS_FLAGS_DISABLE_WORKSPACE2,
IDS_FLAGS_DISABLE_WORKSPACE2_DESCRIPTION,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/base/animation/tween.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698