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

Unified Diff: ui/views/controls/combobox/combobox.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/combobox/combobox.h ('k') | ui/views/controls/combobox/combobox_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/combobox/combobox.cc
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index 3de636fbdc15b1add675be3c316968e7afca2c1f..af0caa6be92b60086508c9893db05a0bed266e65 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -356,7 +356,7 @@ Combobox::Combobox(ui::ComboboxModel* model)
SetFocusable(true);
UpdateBorder();
// set_background() takes ownership but takes a raw pointer.
- scoped_ptr<Background> b = PlatformStyle::CreateComboboxBackground();
+ std::unique_ptr<Background> b = PlatformStyle::CreateComboboxBackground();
set_background(b.release());
// Initialize the button images.
@@ -700,7 +700,8 @@ void Combobox::ButtonPressed(Button* sender, const ui::Event& event) {
}
void Combobox::UpdateBorder() {
- scoped_ptr<FocusableBorder> border(PlatformStyle::CreateComboboxBorder());
+ std::unique_ptr<FocusableBorder> border(
+ PlatformStyle::CreateComboboxBorder());
if (style_ == STYLE_ACTION)
border->SetInsets(5, 10, 5, 10);
if (invalid_)
« no previous file with comments | « ui/views/controls/combobox/combobox.h ('k') | ui/views/controls/combobox/combobox_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698