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

Unified Diff: cc/layers/solid_color_scrollbar_layer_impl.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/solid_color_scrollbar_layer_impl.h ('k') | cc/layers/surface_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/solid_color_scrollbar_layer_impl.cc
diff --git a/cc/layers/solid_color_scrollbar_layer_impl.cc b/cc/layers/solid_color_scrollbar_layer_impl.cc
index 0b0a24e037f21e5f3a97ece4ca873d5a189a81f3..40e47de4237dacb03162258eb0330b8cd0dff897 100644
--- a/cc/layers/solid_color_scrollbar_layer_impl.cc
+++ b/cc/layers/solid_color_scrollbar_layer_impl.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "cc/layers/solid_color_scrollbar_layer_impl.h"
+
+#include "base/memory/ptr_util.h"
#include "cc/quads/solid_color_draw_quad.h"
#include "cc/trees/layer_tree_impl.h"
#include "cc/trees/layer_tree_settings.h"
@@ -10,27 +12,22 @@
namespace cc {
-scoped_ptr<SolidColorScrollbarLayerImpl> SolidColorScrollbarLayerImpl::Create(
- LayerTreeImpl* tree_impl,
- int id,
- ScrollbarOrientation orientation,
- int thumb_thickness,
- int track_start,
- bool is_left_side_vertical_scrollbar,
- bool is_overlay) {
- return make_scoped_ptr(
- new SolidColorScrollbarLayerImpl(tree_impl,
- id,
- orientation,
- thumb_thickness,
- track_start,
- is_left_side_vertical_scrollbar,
- is_overlay));
+std::unique_ptr<SolidColorScrollbarLayerImpl>
+SolidColorScrollbarLayerImpl::Create(LayerTreeImpl* tree_impl,
+ int id,
+ ScrollbarOrientation orientation,
+ int thumb_thickness,
+ int track_start,
+ bool is_left_side_vertical_scrollbar,
+ bool is_overlay) {
+ return base::WrapUnique(new SolidColorScrollbarLayerImpl(
+ tree_impl, id, orientation, thumb_thickness, track_start,
+ is_left_side_vertical_scrollbar, is_overlay));
}
SolidColorScrollbarLayerImpl::~SolidColorScrollbarLayerImpl() {}
-scoped_ptr<LayerImpl> SolidColorScrollbarLayerImpl::CreateLayerImpl(
+std::unique_ptr<LayerImpl> SolidColorScrollbarLayerImpl::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
return SolidColorScrollbarLayerImpl::Create(tree_impl,
id(),
« no previous file with comments | « cc/layers/solid_color_scrollbar_layer_impl.h ('k') | cc/layers/surface_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698