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

Side by Side Diff: ash/wm/session_state_animator_impl.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « ash/wm/screen_dimmer_unittest.cc ('k') | ash/wm/session_state_animator_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_SESSION_STATE_ANIMATOR_IMPL_H_ 5 #ifndef ASH_WM_SESSION_STATE_ANIMATOR_IMPL_H_
6 #define ASH_WM_SESSION_STATE_ANIMATOR_IMPL_H_ 6 #define ASH_WM_SESSION_STATE_ANIMATOR_IMPL_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/session_state_animator.h" 9 #include "ash/wm/session_state_animator.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 SessionStateAnimatorImpl(); 45 SessionStateAnimatorImpl();
46 virtual ~SessionStateAnimatorImpl(); 46 virtual ~SessionStateAnimatorImpl();
47 47
48 // Fills |containers| with the containers included in |container_mask|. 48 // Fills |containers| with the containers included in |container_mask|.
49 static void GetContainers(int container_mask, 49 static void GetContainers(int container_mask,
50 aura::Window::Windows* containers); 50 aura::Window::Windows* containers);
51 51
52 // ash::SessionStateAnimator: 52 // ash::SessionStateAnimator:
53 virtual void StartAnimation(int container_mask, 53 virtual void StartAnimation(int container_mask,
54 AnimationType type, 54 AnimationType type,
55 AnimationSpeed speed) OVERRIDE; 55 AnimationSpeed speed) override;
56 virtual void StartAnimationWithCallback( 56 virtual void StartAnimationWithCallback(
57 int container_mask, 57 int container_mask,
58 AnimationType type, 58 AnimationType type,
59 AnimationSpeed speed, 59 AnimationSpeed speed,
60 base::Closure callback) OVERRIDE; 60 base::Closure callback) override;
61 virtual AnimationSequence* BeginAnimationSequence( 61 virtual AnimationSequence* BeginAnimationSequence(
62 base::Closure callback) OVERRIDE; 62 base::Closure callback) override;
63 virtual bool IsBackgroundHidden() const OVERRIDE; 63 virtual bool IsBackgroundHidden() const override;
64 virtual void ShowBackground() OVERRIDE; 64 virtual void ShowBackground() override;
65 virtual void HideBackground() OVERRIDE; 65 virtual void HideBackground() override;
66 66
67 private: 67 private:
68 class AnimationSequence; 68 class AnimationSequence;
69 friend class AnimationSequence; 69 friend class AnimationSequence;
70 70
71 virtual void StartAnimationInSequence(int container_mask, 71 virtual void StartAnimationInSequence(int container_mask,
72 AnimationType type, 72 AnimationType type,
73 AnimationSpeed speed, 73 AnimationSpeed speed,
74 AnimationSequence* observer); 74 AnimationSequence* observer);
75 75
76 // Apply animation |type| to window |window| with |speed| and add |observer| 76 // Apply animation |type| to window |window| with |speed| and add |observer|
77 // if it is not NULL to the last animation sequence. 77 // if it is not NULL to the last animation sequence.
78 void RunAnimationForWindow(aura::Window* window, 78 void RunAnimationForWindow(aura::Window* window,
79 SessionStateAnimator::AnimationType type, 79 SessionStateAnimator::AnimationType type,
80 SessionStateAnimator::AnimationSpeed speed, 80 SessionStateAnimator::AnimationSpeed speed,
81 ui::LayerAnimationObserver* observer); 81 ui::LayerAnimationObserver* observer);
82 82
83 DISALLOW_COPY_AND_ASSIGN(SessionStateAnimatorImpl); 83 DISALLOW_COPY_AND_ASSIGN(SessionStateAnimatorImpl);
84 }; 84 };
85 85
86 } // namespace ash 86 } // namespace ash
87 87
88 #endif // ASH_WM_SESSION_STATE_ANIMATOR_IMPL_H_ 88 #endif // ASH_WM_SESSION_STATE_ANIMATOR_IMPL_H_
OLDNEW
« no previous file with comments | « ash/wm/screen_dimmer_unittest.cc ('k') | ash/wm/session_state_animator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698