| Index: views/controls/combobox/combobox.cc
|
| diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
|
| index 6e296d9cdcab353a9216255fea26151205e1d2a3..0f8ee2bdee16e2e35578500faaaaa54071d3b460 100644
|
| --- a/views/controls/combobox/combobox.cc
|
| +++ b/views/controls/combobox/combobox.cc
|
| @@ -9,12 +9,9 @@
|
| #include "ui/base/accessibility/accessible_view_state.h"
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| #include "ui/base/models/combobox_model.h"
|
| -#include "views/controls/combobox/native_combobox_wrapper.h"
|
| #include "views/controls/native/native_view_host.h"
|
| #include "views/widget/widget.h"
|
|
|
| -using ui::ComboboxModel; // TODO(beng): remove
|
| -
|
| namespace views {
|
|
|
| // static
|
| @@ -23,7 +20,7 @@ const char Combobox::kViewClassName[] = "views/Combobox";
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Combobox, public:
|
|
|
| -Combobox::Combobox(ComboboxModel* model)
|
| +Combobox::Combobox(ui::ComboboxModel* model)
|
| : native_wrapper_(NULL),
|
| model_(model),
|
| listener_(NULL),
|
|
|