| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/ui/views/payments/view_stack.h" | 5 #include "chrome/browser/ui/views/payments/view_stack.h" |
| 6 | 6 |
| 7 #include <memory> |
| 8 #include <utility> |
| 9 |
| 7 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 8 #include "ui/views/layout/fill_layout.h" | 11 #include "ui/views/layout/fill_layout.h" |
| 9 | 12 |
| 10 ViewStack::ViewStack() | 13 ViewStack::ViewStack() |
| 11 : slide_in_animator_(base::MakeUnique<views::BoundsAnimator>(this)), | 14 : slide_in_animator_(base::MakeUnique<views::BoundsAnimator>(this)), |
| 12 slide_out_animator_(base::MakeUnique<views::BoundsAnimator>(this)) { | 15 slide_out_animator_(base::MakeUnique<views::BoundsAnimator>(this)) { |
| 13 SetLayoutManager(new views::FillLayout()); | 16 SetLayoutManager(new views::FillLayout()); |
| 14 | 17 |
| 15 slide_out_animator_->AddObserver(this); | 18 slide_out_animator_->AddObserver(this); |
| 16 // Paint to a layer and Mask to Bounds, otherwise descendant views that paint | 19 // Paint to a layer and Mask to Bounds, otherwise descendant views that paint |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 } | 93 } |
| 91 | 94 |
| 92 void ViewStack::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { | 95 void ViewStack::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { |
| 93 // This should only be called from slide_out_animator_ when the views going | 96 // This should only be called from slide_out_animator_ when the views going |
| 94 // out are done animating. | 97 // out are done animating. |
| 95 DCHECK_EQ(animator, slide_out_animator_.get()); | 98 DCHECK_EQ(animator, slide_out_animator_.get()); |
| 96 | 99 |
| 97 stack_.pop_back(); | 100 stack_.pop_back(); |
| 98 DCHECK(!stack_.empty()) << "State stack should never be empty"; | 101 DCHECK(!stack_.empty()) << "State stack should never be empty"; |
| 99 } | 102 } |
| OLD | NEW |