| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/controls/combobox/native_combobox_win.h" | 5 #include "views/controls/combobox/native_combobox_win.h" |
| 6 | 6 |
| 7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "ui/base/models/combobox_model.h" | 9 #include "ui/base/models/combobox_model.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/base/win/hwnd_util.h" | 11 #include "ui/base/win/hwnd_util.h" |
| 12 #include "ui/gfx/font.h" | 12 #include "ui/gfx/font.h" |
| 13 #include "ui/gfx/native_theme_win.h" | 13 #include "ui/gfx/native_theme_win.h" |
| 14 #include "views/controls/combobox/combobox.h" | 14 #include "views/controls/combobox/combobox.h" |
| 15 #include "views/controls/combobox/native_combobox_views.h" | 15 #include "views/controls/combobox/native_combobox_views.h" |
| 16 #include "views/widget/widget.h" | 16 #include "views/widget/widget.h" |
| 17 | 17 |
| 18 using ui::ComboboxModel; // TODO(beng): remove | |
| 19 | |
| 20 namespace views { | 18 namespace views { |
| 21 | 19 |
| 22 // Limit how small a combobox can be. | 20 // Limit how small a combobox can be. |
| 23 static const int kMinComboboxWidth = 148; | 21 static const int kMinComboboxWidth = 148; |
| 24 | 22 |
| 25 // Add a couple extra pixels to the widths of comboboxes and combobox | 23 // Add a couple extra pixels to the widths of comboboxes and combobox |
| 26 // dropdowns so that text isn't too crowded. | 24 // dropdowns so that text isn't too crowded. |
| 27 static const int kComboboxExtraPaddingX = 6; | 25 static const int kComboboxExtraPaddingX = 6; |
| 28 | 26 |
| 29 //////////////////////////////////////////////////////////////////////////////// | 27 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 | 207 |
| 210 // static | 208 // static |
| 211 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( | 209 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( |
| 212 Combobox* combobox) { | 210 Combobox* combobox) { |
| 213 if (Widget::IsPureViews()) | 211 if (Widget::IsPureViews()) |
| 214 return new NativeComboboxViews(combobox); | 212 return new NativeComboboxViews(combobox); |
| 215 return new NativeComboboxWin(combobox); | 213 return new NativeComboboxWin(combobox); |
| 216 } | 214 } |
| 217 | 215 |
| 218 } // namespace views | 216 } // namespace views |
| OLD | NEW |