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

Side by Side Diff: chrome/browser/ui/views/payments/view_stack.cc

Issue 2598963005: Include-what-you-use for WrapUnique/MakeUnique. (Closed)
Patch Set: restore order of includes in x11_topmost_window_finder_interactive_uitest.cc Created 3 years, 12 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 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 "base/memory/ptr_util.h"
7 #include "ui/views/layout/fill_layout.h" 8 #include "ui/views/layout/fill_layout.h"
8 9
9 ViewStack::ViewStack() 10 ViewStack::ViewStack()
10 : slide_in_animator_(base::MakeUnique<views::BoundsAnimator>(this)), 11 : slide_in_animator_(base::MakeUnique<views::BoundsAnimator>(this)),
11 slide_out_animator_(base::MakeUnique<views::BoundsAnimator>(this)) { 12 slide_out_animator_(base::MakeUnique<views::BoundsAnimator>(this)) {
12 SetLayoutManager(new views::FillLayout()); 13 SetLayoutManager(new views::FillLayout());
13 14
14 slide_out_animator_->AddObserver(this); 15 slide_out_animator_->AddObserver(this);
15 // Paint to a layer and Mask to Bounds, otherwise descendant views that paint 16 // Paint to a layer and Mask to Bounds, otherwise descendant views that paint
16 // to a layer themselves will still paint while they're being animated out and 17 // to a layer themselves will still paint while they're being animated out and
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 } 90 }
90 91
91 void ViewStack::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { 92 void ViewStack::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
92 // This should only be called from slide_out_animator_ when the views going 93 // This should only be called from slide_out_animator_ when the views going
93 // out are done animating. 94 // out are done animating.
94 DCHECK_EQ(animator, slide_out_animator_.get()); 95 DCHECK_EQ(animator, slide_out_animator_.get());
95 96
96 stack_.pop_back(); 97 stack_.pop_back();
97 DCHECK(!stack_.empty()) << "State stack should never be empty"; 98 DCHECK(!stack_.empty()) << "State stack should never be empty";
98 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698