Chromium Code Reviews| Index: ui/views/controls/combobox/combobox.cc |
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc |
| index abcb93408fa123efeeafecbc2c34c6e26fb82752..cadbfa49efd367ed131bc4e0438cde90ddbe24d2 100644 |
| --- a/ui/views/controls/combobox/combobox.cc |
| +++ b/ui/views/controls/combobox/combobox.cc |
| @@ -15,7 +15,6 @@ |
| #include "ui/base/default_style.h" |
| #include "ui/base/ime/input_method.h" |
| #include "ui/base/material_design/material_design_controller.h" |
| -#include "ui/base/models/combobox_model.h" |
| #include "ui/base/models/combobox_model_observer.h" |
| #include "ui/base/resource/resource_bundle.h" |
| #include "ui/events/event.h" |
| @@ -394,6 +393,11 @@ class Combobox::ComboboxMenuModel : public ui::MenuModel, |
| //////////////////////////////////////////////////////////////////////////////// |
| // Combobox, public: |
| +Combobox::Combobox(std::unique_ptr<ui::ComboboxModel> model, Style style) |
| + : Combobox(model.get(), style) { |
|
please use gerrit instead
2017/02/15 15:59:39
: Combobox(model.get(), style), owned_model_(std::
Mathieu
2017/02/15 17:04:15
When there is a delegated constructor, initializin
|
| + owned_model_ = std::move(model); |
| +} |
| + |
| Combobox::Combobox(ui::ComboboxModel* model, Style style) |
| : model_(model), |
| style_(style), |