summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_animations.cc
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 02:37:08 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 02:37:08 +0000
commite7c32ab1523eed2d3a3cdfac0f07c1a4d9805e58 (patch)
tree87067b0cdf4e587417916eba06c69d4485b9d9d4 /ash/wm/window_animations.cc
parentce062afb658deb20db3323863927993759c9a97e (diff)
downloadchromium_src-e7c32ab1523eed2d3a3cdfac0f07c1a4d9805e58.zip
chromium_src-e7c32ab1523eed2d3a3cdfac0f07c1a4d9805e58.tar.gz
chromium_src-e7c32ab1523eed2d3a3cdfac0f07c1a4d9805e58.tar.bz2
Aura: Fix linter warnings.
Review URL: https://chromiumcodereview.appspot.com/12330017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_animations.cc')
-rw-r--r--ash/wm/window_animations.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 061ce82..45348c7 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -70,7 +70,7 @@ int64 Round64(float f) {
return static_cast<int64>(f + 0.5f);
}
-}
+} // namespace
gfx::Rect GetMinimizeRectForWindow(aura::Window* window) {
Launcher* launcher = Launcher::ForWindow(window);
@@ -140,7 +140,7 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
// to save bandwidth and reduce jank.
if (!show) {
window->layer()->GetAnimator()->SchedulePauseForProperties(
- (duration * 3 ) / 4, ui::LayerAnimationElement::OPACITY, -1);
+ (duration * 3) / 4, ui::LayerAnimationElement::OPACITY, -1);
}
// Fade in and out quickly when the window is small to reduce jank.
@@ -207,13 +207,13 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window,
views::corewm::CreateHidingWindowAnimationObserver(window));
}
- window->layer()->GetAnimator()->
- ScheduleTogether(
- CreateBrightnessGrayscaleAnimationSequence(end_value, duration));
- if (!show) {
- window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
- window->layer()->SetVisible(false);
- }
+ window->layer()->GetAnimator()->
+ ScheduleTogether(
+ CreateBrightnessGrayscaleAnimationSequence(end_value, duration));
+ if (!show) {
+ window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
+ window->layer()->SetVisible(false);
+ }
}
void AnimateShowWindow_BrightnessGrayscale(aura::Window* window) {