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

Side by Side Diff: ash/test/test_session_state_animator.cc

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_session_state_animator.h ('k') | ash/test/test_session_state_delegate.h » ('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 #include "ash/test/test_session_state_animator.h" 5 #include "ash/test/test_session_state_animator.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 if (sequence_aborted_) 56 if (sequence_aborted_)
57 OnAnimationAborted(); 57 OnAnimationAborted();
58 else 58 else
59 OnAnimationCompleted(); 59 OnAnimationCompleted();
60 } 60 }
61 } 61 }
62 62
63 // ash::SessionStateAnimator::AnimationSequence: 63 // ash::SessionStateAnimator::AnimationSequence:
64 virtual void StartAnimation(int container_mask, 64 virtual void StartAnimation(int container_mask,
65 AnimationType type, 65 AnimationType type,
66 AnimationSpeed speed) OVERRIDE { 66 AnimationSpeed speed) override {
67 animator_->StartAnimationInSequence(container_mask, type, speed, this); 67 animator_->StartAnimationInSequence(container_mask, type, speed, this);
68 } 68 }
69 69
70 private: 70 private:
71 // Tracks the number of contained animations. 71 // Tracks the number of contained animations.
72 int sequence_count_; 72 int sequence_count_;
73 73
74 // True if the sequence was aborted. 74 // True if the sequence was aborted.
75 bool sequence_aborted_; 75 bool sequence_aborted_;
76 76
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 while (animation_iter != (*container_iter).second.end()) { 295 while (animation_iter != (*container_iter).second.end()) {
296 ActiveAnimation active_animation = *animation_iter; 296 ActiveAnimation active_animation = *animation_iter;
297 active_animation.failed_callback.Run(); 297 active_animation.failed_callback.Run();
298 animation_iter = (*container_iter).second.erase(animation_iter); 298 animation_iter = (*container_iter).second.erase(animation_iter);
299 } 299 }
300 } 300 }
301 } 301 }
302 302
303 } // namespace test 303 } // namespace test
304 } // namespace ash 304 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_session_state_animator.h ('k') | ash/test/test_session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698