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

Unified Diff: ui/wm/core/image_grid.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/wm/core/focus_controller_unittest.cc ('k') | ui/wm/core/image_grid.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/image_grid.h
diff --git a/ui/wm/core/image_grid.h b/ui/wm/core/image_grid.h
index 8d22595d9ac265bdfa2be49d03cffccdfdd81a34..eba2817840f65119f49556a9448b2f4a68c31a86 100644
--- a/ui/wm/core/image_grid.h
+++ b/ui/wm/core/image_grid.h
@@ -5,8 +5,9 @@
#ifndef UI_WM_CORE_IMAGE_GRID_H_
#define UI_WM_CORE_IMAGE_GRID_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_delegate.h"
#include "ui/gfx/geometry/rect.h"
@@ -164,12 +165,12 @@ class WM_EXPORT ImageGrid {
// guarantee that it has minimum size in order for scaling work properly
// with fractional device scale factors. crbug.com/376519.
void SetImage(const gfx::Image* image,
- scoped_ptr<ui::Layer>* layer_ptr,
- scoped_ptr<ImagePainter>* painter_ptr,
+ std::unique_ptr<ui::Layer>* layer_ptr,
+ std::unique_ptr<ImagePainter>* painter_ptr,
ImageType type);
// Layer that contains all of the image layers.
- scoped_ptr<ui::Layer> layer_;
+ std::unique_ptr<ui::Layer> layer_;
// The grid's dimensions.
gfx::Size size_;
@@ -191,27 +192,27 @@ class WM_EXPORT ImageGrid {
// Layers used to display the various images. Children of |layer_|.
// Positions for which no images were supplied are NULL.
- scoped_ptr<ui::Layer> top_left_layer_;
- scoped_ptr<ui::Layer> top_layer_;
- scoped_ptr<ui::Layer> top_right_layer_;
- scoped_ptr<ui::Layer> left_layer_;
- scoped_ptr<ui::Layer> center_layer_;
- scoped_ptr<ui::Layer> right_layer_;
- scoped_ptr<ui::Layer> bottom_left_layer_;
- scoped_ptr<ui::Layer> bottom_layer_;
- scoped_ptr<ui::Layer> bottom_right_layer_;
+ std::unique_ptr<ui::Layer> top_left_layer_;
+ std::unique_ptr<ui::Layer> top_layer_;
+ std::unique_ptr<ui::Layer> top_right_layer_;
+ std::unique_ptr<ui::Layer> left_layer_;
+ std::unique_ptr<ui::Layer> center_layer_;
+ std::unique_ptr<ui::Layer> right_layer_;
+ std::unique_ptr<ui::Layer> bottom_left_layer_;
+ std::unique_ptr<ui::Layer> bottom_layer_;
+ std::unique_ptr<ui::Layer> bottom_right_layer_;
// Delegates responsible for painting the above layers.
// Positions for which no images were supplied are NULL.
- scoped_ptr<ImagePainter> top_left_painter_;
- scoped_ptr<ImagePainter> top_painter_;
- scoped_ptr<ImagePainter> top_right_painter_;
- scoped_ptr<ImagePainter> left_painter_;
- scoped_ptr<ImagePainter> center_painter_;
- scoped_ptr<ImagePainter> right_painter_;
- scoped_ptr<ImagePainter> bottom_left_painter_;
- scoped_ptr<ImagePainter> bottom_painter_;
- scoped_ptr<ImagePainter> bottom_right_painter_;
+ std::unique_ptr<ImagePainter> top_left_painter_;
+ std::unique_ptr<ImagePainter> top_painter_;
+ std::unique_ptr<ImagePainter> top_right_painter_;
+ std::unique_ptr<ImagePainter> left_painter_;
+ std::unique_ptr<ImagePainter> center_painter_;
+ std::unique_ptr<ImagePainter> right_painter_;
+ std::unique_ptr<ImagePainter> bottom_left_painter_;
+ std::unique_ptr<ImagePainter> bottom_painter_;
+ std::unique_ptr<ImagePainter> bottom_right_painter_;
DISALLOW_COPY_AND_ASSIGN(ImageGrid);
};
« no previous file with comments | « ui/wm/core/focus_controller_unittest.cc ('k') | ui/wm/core/image_grid.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698