| Index: ui/views/controls/combobox/combobox.cc
|
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
|
| index 41cb16df1dba874edfcec6fb1709ea2fad3a1767..a643cb462a54525547e07ab24324767a4424bcaf 100644
|
| --- a/ui/views/controls/combobox/combobox.cc
|
| +++ b/ui/views/controls/combobox/combobox.cc
|
| @@ -378,7 +378,7 @@ void Combobox::ExecuteCommand(int id) {
|
| OnPerformAction();
|
| }
|
|
|
| -bool Combobox::GetAccelerator(int id, ui::Accelerator* accel) {
|
| +bool Combobox::GetAccelerator(int id, ui::Accelerator* accel) const {
|
| return false;
|
| }
|
|
|
| @@ -405,10 +405,7 @@ base::string16 Combobox::GetTextForRow(int row) {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Combobox, View overrides:
|
|
|
| -gfx::Size Combobox::GetPreferredSize() {
|
| - if (content_size_.IsEmpty())
|
| - UpdateFromModel();
|
| -
|
| +gfx::Size Combobox::GetPreferredSize() const {
|
| // The preferred size will drive the local bounds which in turn is used to set
|
| // the minimum width for the dropdown list.
|
| gfx::Insets insets = GetInsets();
|
|
|