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

Unified Diff: ui/views/style/platform_style_mac.mm

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/views/style/platform_style_linux.cc ('k') | ui/views/test/combobox_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/style/platform_style_mac.mm
diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm
index b2170ca1d5b451e4077ce4c58d8a70786db10c00..550d9b2d957931d4e1929235b8d62c5f6bd57970 100644
--- a/ui/views/style/platform_style_mac.mm
+++ b/ui/views/style/platform_style_mac.mm
@@ -4,6 +4,7 @@
#include "ui/views/style/platform_style.h"
+#include "base/memory/ptr_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons.h"
@@ -37,27 +38,27 @@ gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
}
// static
-scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
- return make_scoped_ptr(new FocusableRoundedBorder);
+std::unique_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
+ return base::WrapUnique(new FocusableRoundedBorder);
}
// static
-scoped_ptr<Background> PlatformStyle::CreateComboboxBackground() {
- return make_scoped_ptr(new ComboboxBackgroundMac);
+std::unique_ptr<Background> PlatformStyle::CreateComboboxBackground() {
+ return base::WrapUnique(new ComboboxBackgroundMac);
}
// static
-scoped_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
+std::unique_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
Button::ButtonStyle style) {
if (style == Button::STYLE_BUTTON)
- return make_scoped_ptr(new DialogButtonBorderMac());
+ return base::WrapUnique(new DialogButtonBorderMac());
- return make_scoped_ptr(new LabelButtonAssetBorder(style));
+ return base::WrapUnique(new LabelButtonAssetBorder(style));
}
// static
-scoped_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
- return make_scoped_ptr(new CocoaScrollBar(is_horizontal));
+std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
+ return base::WrapUnique(new CocoaScrollBar(is_horizontal));
}
// static
« no previous file with comments | « ui/views/style/platform_style_linux.cc ('k') | ui/views/test/combobox_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698