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

Unified Diff: ash/wm/window_animations.cc

Issue 10824203: Initialize OOBE/login WebUI in hidden state in parallel with wallpaper animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix how login prompt-visible is emitted Created 8 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 | « no previous file | chrome/browser/chromeos/login/webui_login_display_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index b3f80e34d66e6dc6664f20fce0dea976a1cb4046..a27fa1d43188c75e8e5e3a9092e451e923cfcdc6 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -71,7 +71,7 @@ const float kCrossFadeDurationMinMs = 100.f;
const float kCrossFadeDurationMaxMs = 400.f;
// Durations for the brightness/grayscale fade animation, in milliseconds.
-const int kBrightnessGrayscaleFadeDurationMs = 2000;
+const int kBrightnessGrayscaleFadeDurationMs = 1000;
// Brightness/grayscale values for hide/show window animations.
const float kWindowAnimation_HideBrightnessGrayscale = 1.f;
@@ -506,16 +506,21 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window,
scoped_ptr<ui::LayerAnimationSequence> grayscale_sequence(
new ui::LayerAnimationSequence());
- brightness_sequence->AddElement(
+ scoped_ptr<ui::LayerAnimationElement> brightness_element(
ui::LayerAnimationElement::CreateBrightnessElement(
end_value,
base::TimeDelta::FromMilliseconds(
kBrightnessGrayscaleFadeDurationMs)));
- grayscale_sequence->AddElement(
+ brightness_element->set_tween_type(ui::Tween::EASE_OUT);
+ brightness_sequence->AddElement(brightness_element.release());
+
+ scoped_ptr<ui::LayerAnimationElement> grayscale_element(
ui::LayerAnimationElement::CreateGrayscaleElement(
end_value,
base::TimeDelta::FromMilliseconds(
kBrightnessGrayscaleFadeDurationMs)));
+ grayscale_element->set_tween_type(ui::Tween::EASE_OUT);
+ grayscale_sequence->AddElement(grayscale_element.release());
std::vector<ui::LayerAnimationSequence*> animations;
animations.push_back(brightness_sequence.release());
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/webui_login_display_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698