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

Side by Side Diff: ash/test/test_session_state_animator.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/test/test_screenshot_delegate.h ('k') | ash/test/test_session_state_animator.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TEST_TEST_SESSION_STATE_ANIMATOR_H_ 5 #ifndef ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
6 #define ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_ 6 #define ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // containers specified by |container_mask|. 59 // containers specified by |container_mask|.
60 bool AreContainersAnimated(int container_mask, 60 bool AreContainersAnimated(int container_mask,
61 SessionStateAnimator::AnimationType type) const; 61 SessionStateAnimator::AnimationType type) const;
62 62
63 // Returns the number of active animations. 63 // Returns the number of active animations.
64 size_t GetAnimationCount() const; 64 size_t GetAnimationCount() const;
65 65
66 // ash::SessionStateAnimator: 66 // ash::SessionStateAnimator:
67 virtual void StartAnimation(int container_mask, 67 virtual void StartAnimation(int container_mask,
68 AnimationType type, 68 AnimationType type,
69 AnimationSpeed speed) OVERRIDE; 69 AnimationSpeed speed) override;
70 virtual void StartAnimationWithCallback( 70 virtual void StartAnimationWithCallback(
71 int container_mask, 71 int container_mask,
72 AnimationType type, 72 AnimationType type,
73 AnimationSpeed speed, 73 AnimationSpeed speed,
74 base::Closure callback) OVERRIDE; 74 base::Closure callback) override;
75 virtual AnimationSequence* BeginAnimationSequence( 75 virtual AnimationSequence* BeginAnimationSequence(
76 base::Closure callback) OVERRIDE; 76 base::Closure callback) override;
77 virtual bool IsBackgroundHidden() const OVERRIDE; 77 virtual bool IsBackgroundHidden() const override;
78 virtual void ShowBackground() OVERRIDE; 78 virtual void ShowBackground() override;
79 virtual void HideBackground() OVERRIDE; 79 virtual void HideBackground() override;
80 80
81 private: 81 private:
82 class AnimationSequence; 82 class AnimationSequence;
83 friend class AnimationSequence; 83 friend class AnimationSequence;
84 84
85 // Data structure to track the currently active animations and their 85 // Data structure to track the currently active animations and their
86 // callbacks. 86 // callbacks.
87 struct ActiveAnimation { 87 struct ActiveAnimation {
88 ActiveAnimation( 88 ActiveAnimation(
89 int animation_epoch, 89 int animation_epoch,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 // Tracks whether the background is hidden or not. 157 // Tracks whether the background is hidden or not.
158 bool is_background_hidden_; 158 bool is_background_hidden_;
159 159
160 DISALLOW_COPY_AND_ASSIGN(TestSessionStateAnimator); 160 DISALLOW_COPY_AND_ASSIGN(TestSessionStateAnimator);
161 }; 161 };
162 162
163 } // namespace test 163 } // namespace test
164 } // namespace ash 164 } // namespace ash
165 165
166 #endif // ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_ 166 #endif // ASH_TEST_TEST_SESSION_STATE_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ash/test/test_screenshot_delegate.h ('k') | ash/test/test_session_state_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698