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

Side by Side Diff: ui/views/animation/square_ink_drop_animation_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_ 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_ 6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
7 7
8 #include "ui/views/animation/square_ink_drop_animation.h" 8 #include "ui/views/animation/square_ink_drop_animation.h"
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 #include "ui/gfx/geometry/point.h" 14 #include "ui/gfx/geometry/point.h"
14 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/size.h"
15 #include "ui/gfx/geometry/size_f.h" 16 #include "ui/gfx/geometry/size_f.h"
16 #include "ui/views/animation/ink_drop_animation_observer.h" 17 #include "ui/views/animation/ink_drop_animation_observer.h"
17 #include "ui/views/animation/ink_drop_state.h" 18 #include "ui/views/animation/ink_drop_state.h"
18 #include "ui/views/animation/test/square_ink_drop_animation_test_api.h" 19 #include "ui/views/animation/test/square_ink_drop_animation_test_api.h"
19 #include "ui/views/animation/test/test_ink_drop_animation_observer.h" 20 #include "ui/views/animation/test/test_ink_drop_animation_observer.h"
20 21
21 namespace views { 22 namespace views {
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 TransformPoint(transform, kDrawnTopMidPoint)); 240 TransformPoint(transform, kDrawnTopMidPoint));
240 EXPECT_EQ(test_cases[i].bottom_mid_point, 241 EXPECT_EQ(test_cases[i].bottom_mid_point,
241 TransformPoint(transform, kDrawnBottomMidPoint)); 242 TransformPoint(transform, kDrawnBottomMidPoint));
242 } 243 }
243 } 244 }
244 245
245 } // namespace test 246 } // namespace test
246 } // namespace views 247 } // namespace views
247 248
248 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_ 249 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
OLDNEW
« no previous file with comments | « ui/views/animation/square_ink_drop_animation.h ('k') | ui/views/animation/test/test_ink_drop_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698