| Index: ui/views/examples/combobox_example.cc
|
| diff --git a/ui/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc
|
| index 0201611ad0ecd200d5ebfc1a9a538e9b64197cde..4c4fdb300b979d6f43ffe6c1f6e6a02875cb7c34 100644
|
| --- a/ui/views/examples/combobox_example.cc
|
| +++ b/ui/views/examples/combobox_example.cc
|
| @@ -32,8 +32,10 @@ ComboboxExample::ComboboxExample() : ExampleBase("Combo Box") {
|
| ComboboxExample::~ComboboxExample() {
|
| // Delete |combobox_| first as it references |combobox_model_|.
|
| delete combobox_;
|
| + delete disabled_combobox_;
|
| delete action_combobox_;
|
| combobox_ = nullptr;
|
| + disabled_combobox_ = nullptr;
|
| action_combobox_ = nullptr;
|
| }
|
|
|
| @@ -42,6 +44,11 @@ void ComboboxExample::CreateExampleView(View* container) {
|
| combobox_->set_listener(this);
|
| combobox_->SetSelectedIndex(3);
|
|
|
| + disabled_combobox_ = new Combobox(&combobox_model_);
|
| + disabled_combobox_->set_listener(this);
|
| + disabled_combobox_->SetSelectedIndex(4);
|
| + disabled_combobox_->SetEnabled(false);
|
| +
|
| action_combobox_ = new Combobox(&combobox_model_);
|
| action_combobox_->set_listener(this);
|
| action_combobox_->SetStyle(Combobox::STYLE_ACTION);
|
| @@ -52,6 +59,7 @@ void ComboboxExample::CreateExampleView(View* container) {
|
| BoxLayout::kVertical,
|
| 1, 1, 1));
|
| container->AddChildView(combobox_);
|
| + container->AddChildView(disabled_combobox_);
|
| container->AddChildView(action_combobox_);
|
| }
|
|
|
|
|