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

Unified Diff: ui/views/controls/combobox/combobox.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/views/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/combobox/combobox.h
diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h
index 64e4baa9be1098971ac89c1c21c07807cb2c46d1..2705f7e22cc57e836ec64d03223a41bce479a585 100644
--- a/ui/views/controls/combobox/combobox.h
+++ b/ui/views/controls/combobox/combobox.h
@@ -167,10 +167,10 @@ class VIEWS_EXPORT Combobox : public PrefixDelegate, public ButtonListener {
base::string16 accessible_name_;
// A helper used to select entries by keyboard input.
- scoped_ptr<PrefixSelector> selector_;
+ std::unique_ptr<PrefixSelector> selector_;
// Adapts a ComboboxModel for use by a views MenuRunner.
- scoped_ptr<ui::MenuModel> menu_model_adapter_;
+ std::unique_ptr<ui::MenuModel> menu_model_adapter_;
// Like MenuButton, we use a time object in order to keep track of when the
// combobox was closed. The time is used for simulating menu behavior; that
@@ -186,7 +186,7 @@ class VIEWS_EXPORT Combobox : public PrefixDelegate, public ButtonListener {
// The painters or images that are used when |style_| is STYLE_BUTTONS. The
// first index means the state of unfocused or focused.
// The images are owned by ResourceBundle.
- scoped_ptr<Painter> body_button_painters_[2][Button::STATE_COUNT];
+ std::unique_ptr<Painter> body_button_painters_[2][Button::STATE_COUNT];
std::vector<const gfx::ImageSkia*>
menu_button_images_[2][Button::STATE_COUNT];
@@ -201,7 +201,7 @@ class VIEWS_EXPORT Combobox : public PrefixDelegate, public ButtonListener {
// Set while the dropdown is showing. Ensures the menu is closed if |this| is
// destroyed.
- scoped_ptr<views::MenuRunner> menu_runner_;
+ std::unique_ptr<views::MenuRunner> menu_runner_;
// Used for making calbacks.
base::WeakPtrFactory<Combobox> weak_ptr_factory_;
« no previous file with comments | « ui/views/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698