Index: ash/wm/window_animations.cc |
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc |
index b3f80e34d66e6dc6664f20fce0dea976a1cb4046..edab8ee4e5bffe41f5b9c06a40482cf2938ce111 100644 |
--- a/ash/wm/window_animations.cc |
+++ b/ash/wm/window_animations.cc |
@@ -517,14 +517,14 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window, |
base::TimeDelta::FromMilliseconds( |
kBrightnessGrayscaleFadeDurationMs))); |
- std::vector<ui::LayerAnimationSequence*> animations; |
- animations.push_back(brightness_sequence.release()); |
- animations.push_back(grayscale_sequence.release()); |
- window->layer()->GetAnimator()->ScheduleTogether(animations); |
- if (!show) { |
- window->layer()->SetOpacity(kWindowAnimation_HideOpacity); |
- window->layer()->SetVisible(false); |
- } |
+ std::vector<ui::LayerAnimationSequence*> animations; |
+ animations.push_back(brightness_sequence.release()); |
+ animations.push_back(grayscale_sequence.release()); |
+ window->layer()->GetAnimator()->ScheduleTogether(animations); |
+ if (!show) { |
+ window->layer()->SetOpacity(kWindowAnimation_HideOpacity); |
+ window->layer()->SetVisible(false); |
+ } |
} |
void AnimateShowWindow_BrightnessGrayscale(aura::Window* window) { |
@@ -642,10 +642,6 @@ class CrossFadeObserver : public ui::CompositorObserver, |
} |
// ui::CompositorObserver overrides: |
- virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE { |
- } |
- virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE { |
- } |
virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE { |
} |
virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { |