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

Side by Side Diff: ui/wm/core/window_animations_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/wm/core/window_animations.cc ('k') | ui/wm/core/window_modality_controller.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 (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 #include "ui/wm/core/window_animations.h" 5 #include "ui/wm/core/window_animations.h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "ui/aura/test/aura_test_base.h" 8 #include "ui/aura/test/aura_test_base.h"
9 #include "ui/aura/test/test_windows.h" 9 #include "ui/aura/test/test_windows.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 29 matching lines...) Expand all
40 int GetLayerZPosition(const ui::Layer* child) { 40 int GetLayerZPosition(const ui::Layer* child) {
41 return GetZPosition<ui::Layer>(child); 41 return GetZPosition<ui::Layer>(child);
42 } 42 }
43 43
44 } // namespace 44 } // namespace
45 45
46 class WindowAnimationsTest : public aura::test::AuraTestBase { 46 class WindowAnimationsTest : public aura::test::AuraTestBase {
47 public: 47 public:
48 WindowAnimationsTest() {} 48 WindowAnimationsTest() {}
49 49
50 virtual void TearDown() OVERRIDE { 50 virtual void TearDown() override {
51 AuraTestBase::TearDown(); 51 AuraTestBase::TearDown();
52 } 52 }
53 53
54 private: 54 private:
55 DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest); 55 DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
56 }; 56 };
57 57
58 TEST_F(WindowAnimationsTest, LayerTargetVisibility) { 58 TEST_F(WindowAnimationsTest, LayerTargetVisibility) {
59 scoped_ptr<aura::Window> window( 59 scoped_ptr<aura::Window> window(
60 aura::test::CreateTestWindowWithId(0, NULL)); 60 aura::test::CreateTestWindowWithId(0, NULL));
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 } 251 }
252 } 252 }
253 253
254 // A simple AnimationHost implementation for the NotifyHideCompleted test. 254 // A simple AnimationHost implementation for the NotifyHideCompleted test.
255 class NotifyHideCompletedAnimationHost : public aura::client::AnimationHost { 255 class NotifyHideCompletedAnimationHost : public aura::client::AnimationHost {
256 public: 256 public:
257 NotifyHideCompletedAnimationHost() : hide_completed_(false) {} 257 NotifyHideCompletedAnimationHost() : hide_completed_(false) {}
258 virtual ~NotifyHideCompletedAnimationHost() {} 258 virtual ~NotifyHideCompletedAnimationHost() {}
259 259
260 // Overridden from TestWindowDelegate: 260 // Overridden from TestWindowDelegate:
261 virtual void OnWindowHidingAnimationCompleted() OVERRIDE { 261 virtual void OnWindowHidingAnimationCompleted() override {
262 hide_completed_ = true; 262 hide_completed_ = true;
263 } 263 }
264 264
265 virtual void SetHostTransitionOffsets( 265 virtual void SetHostTransitionOffsets(
266 const gfx::Vector2d& top_left, 266 const gfx::Vector2d& top_left,
267 const gfx::Vector2d& bottom_right) OVERRIDE {} 267 const gfx::Vector2d& bottom_right) override {}
268 268
269 bool hide_completed() const { return hide_completed_; } 269 bool hide_completed() const { return hide_completed_; }
270 270
271 private: 271 private:
272 bool hide_completed_; 272 bool hide_completed_;
273 273
274 DISALLOW_COPY_AND_ASSIGN(NotifyHideCompletedAnimationHost); 274 DISALLOW_COPY_AND_ASSIGN(NotifyHideCompletedAnimationHost);
275 }; 275 };
276 276
277 TEST_F(WindowAnimationsTest, NotifyHideCompleted) { 277 TEST_F(WindowAnimationsTest, NotifyHideCompleted) {
(...skipping 21 matching lines...) Expand all
299 wm::SetWindowVisibilityAnimationType(window.get(), 299 wm::SetWindowVisibilityAnimationType(window.get(),
300 WINDOW_VISIBILITY_ANIMATION_TYPE_ROTATE); 300 WINDOW_VISIBILITY_ANIMATION_TYPE_ROTATE);
301 301
302 AnimateOnChildWindowVisibilityChanged(window.get(), true); 302 AnimateOnChildWindowVisibilityChanged(window.get(), true);
303 AnimateOnChildWindowVisibilityChanged(window.get(), false); 303 AnimateOnChildWindowVisibilityChanged(window.get(), false);
304 304
305 animating_layer->GetAnimator()->StopAnimating(); 305 animating_layer->GetAnimator()->StopAnimating();
306 } 306 }
307 307
308 } // namespace wm 308 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/window_animations.cc ('k') | ui/wm/core/window_modality_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698