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

Side by Side Diff: ui/views/animation/ink_drop_animation_controller_factory.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 #include "ui/views/animation/ink_drop_animation_controller_factory.h" 5 #include "ui/views/animation/ink_drop_animation_controller_factory.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "ui/base/material_design/material_design_controller.h" 8 #include "ui/base/material_design/material_design_controller.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 #include "ui/gfx/geometry/size.h" 10 #include "ui/gfx/geometry/size.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void InkDropAnimationControllerStub::SnapToActivated() {} 52 void InkDropAnimationControllerStub::SnapToActivated() {}
53 53
54 void InkDropAnimationControllerStub::SetHovered(bool is_hovered) {} 54 void InkDropAnimationControllerStub::SetHovered(bool is_hovered) {}
55 55
56 } // namespace 56 } // namespace
57 57
58 InkDropAnimationControllerFactory::InkDropAnimationControllerFactory() {} 58 InkDropAnimationControllerFactory::InkDropAnimationControllerFactory() {}
59 59
60 InkDropAnimationControllerFactory::~InkDropAnimationControllerFactory() {} 60 InkDropAnimationControllerFactory::~InkDropAnimationControllerFactory() {}
61 61
62 scoped_ptr<InkDropAnimationController> 62 std::unique_ptr<InkDropAnimationController>
63 InkDropAnimationControllerFactory::CreateInkDropAnimationController( 63 InkDropAnimationControllerFactory::CreateInkDropAnimationController(
64 InkDropHost* ink_drop_host) { 64 InkDropHost* ink_drop_host) {
65 if (ui::MaterialDesignController::IsModeMaterial()) { 65 if (ui::MaterialDesignController::IsModeMaterial()) {
66 return scoped_ptr<InkDropAnimationController>( 66 return std::unique_ptr<InkDropAnimationController>(
67 new InkDropAnimationControllerImpl(ink_drop_host)); 67 new InkDropAnimationControllerImpl(ink_drop_host));
68 } 68 }
69 69
70 return scoped_ptr<InkDropAnimationController>( 70 return std::unique_ptr<InkDropAnimationController>(
71 new InkDropAnimationControllerStub()); 71 new InkDropAnimationControllerStub());
72 } 72 }
73 73
74 } // namespace views 74 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698