| Index: ui/views/controls/combobox/combobox.cc
|
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
|
| index 9c0eaea62ff6657cc02f14f9a0c1d135859827c3..a5f70a32e3d3aa5a4d0eeba73ebbc37c0a02b3b9 100644
|
| --- a/ui/views/controls/combobox/combobox.cc
|
| +++ b/ui/views/controls/combobox/combobox.cc
|
| @@ -9,6 +9,7 @@
|
| #include "ui/base/accessibility/accessible_view_state.h"
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| #include "ui/base/models/combobox_model.h"
|
| +#include "ui/base/resource/resource_bundle.h"
|
| #include "ui/views/controls/combobox/combobox_listener.h"
|
| #include "ui/views/controls/native/native_view_host.h"
|
| #include "ui/views/widget/widget.h"
|
| @@ -21,6 +22,12 @@ const char Combobox::kViewClassName[] = "views/Combobox";
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Combobox, public:
|
|
|
| +// static
|
| +const gfx::Font& Combobox::GetFont() {
|
| + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| + return rb.GetFont(ui::ResourceBundle::BaseFont);
|
| +}
|
| +
|
| Combobox::Combobox(ui::ComboboxModel* model)
|
| : native_wrapper_(NULL),
|
| model_(model),
|
|
|