diff options
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash_switches.cc | 9 | ||||
| -rw-r--r-- | ash/ash_switches.h | 3 | ||||
| -rw-r--r-- | ash/wm/window_animations.cc | 8 |
3 files changed, 0 insertions, 20 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 62fba9a..c4eccab 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -17,12 +17,6 @@ namespace switches { const char kAshAnimateFromBootSplashScreen[] = "ash-animate-from-boot-splash-screen"; -// Variation of boot animation that uses Tween::EASE_OUT_2. -const char kAshBootAnimationFunction2[] = "ash-boot-animation-function2"; - -// Variation of boot animation that uses Tween::EASE_OUT_3. -const char kAshBootAnimationFunction3[] = "ash-boot-animation-function3"; - // Constrains the pointer movement within a root window on desktop. const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root"; @@ -42,9 +36,6 @@ const char kAshDisableAutoMaximizing[] = "ash-disable-auto-maximizing"; const char kAshDisableAutoWindowPlacement[] = "ash-enable-auto-window-placement"; -// Disables boot animation v2, go back to v1. -const char kAshDisableBootAnimation2[] = "ash-disable-boot-animation2"; - // Disables the limitter to throttle how quickly a user // can change display settings. const char kAshDisableDisplayChangeLimiter[] = diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 601ec55..75e2374 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -18,14 +18,11 @@ namespace switches { // Please keep alphabetized. ASH_EXPORT extern const char kAshAnimateFromBootSplashScreen[]; -ASH_EXPORT extern const char kAshBootAnimationFunction2[]; -ASH_EXPORT extern const char kAshBootAnimationFunction3[]; ASH_EXPORT extern const char kAshConstrainPointerToRoot[]; ASH_EXPORT extern const char kAshCopyHostBackgroundAtBoot[]; ASH_EXPORT extern const char kAshDebugShortcuts[]; ASH_EXPORT extern const char kAshDisableAutoMaximizing[]; ASH_EXPORT extern const char kAshDisableAutoWindowPlacement[]; -ASH_EXPORT extern const char kAshDisableBootAnimation2[]; ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[]; ASH_EXPORT extern const char kAshDisableImmersiveFullscreen[]; ASH_EXPORT extern const char kAshDisableNewAudioHandler[]; diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 45348c7..f490a67 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -9,7 +9,6 @@ #include <algorithm> #include <vector> -#include "ash/ash_switches.h" #include "ash/launcher/launcher.h" #include "ash/screen_ash.h" #include "ash/shell.h" @@ -477,13 +476,6 @@ std::vector<ui::LayerAnimationSequence*> CreateBrightnessGrayscaleAnimationSequence(float target_value, base::TimeDelta duration) { ui::Tween::Type animation_type = ui::Tween::EASE_OUT; - if (CommandLine::ForCurrentProcess()->HasSwitch( - ash::switches::kAshBootAnimationFunction2)) { - animation_type = ui::Tween::EASE_OUT_2; - } else if (CommandLine::ForCurrentProcess()->HasSwitch( - ash::switches::kAshBootAnimationFunction3)) { - animation_type = ui::Tween::EASE_OUT_3; - } scoped_ptr<ui::LayerAnimationSequence> brightness_sequence( new ui::LayerAnimationSequence()); scoped_ptr<ui::LayerAnimationSequence> grayscale_sequence( |