| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/views/controls/combo_box.h" | 5 #include "chrome/views/controls/combo_box.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" |
| 7 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 8 #include "base/gfx/native_theme.h" | 9 #include "base/gfx/native_theme.h" |
| 9 #include "base/gfx/rect.h" | 10 #include "base/gfx/rect.h" |
| 10 #include "chrome/common/gfx/chrome_canvas.h" | 11 #include "chrome/common/gfx/chrome_canvas.h" |
| 11 #include "chrome/common/gfx/chrome_font.h" | 12 #include "chrome/common/gfx/chrome_font.h" |
| 12 #include "chrome/common/l10n_util.h" | |
| 13 | 13 |
| 14 // Limit how small a combobox can be. | 14 // Limit how small a combobox can be. |
| 15 static const int kMinComboboxWidth = 148; | 15 static const int kMinComboboxWidth = 148; |
| 16 | 16 |
| 17 // Add a couple extra pixels to the widths of comboboxes and combobox | 17 // Add a couple extra pixels to the widths of comboboxes and combobox |
| 18 // dropdowns so that text isn't too crowded. | 18 // dropdowns so that text isn't too crowded. |
| 19 static const int kComboboxExtraPaddingX = 6; | 19 static const int kComboboxExtraPaddingX = 6; |
| 20 | 20 |
| 21 namespace views { | 21 namespace views { |
| 22 | 22 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 // ComboBox::Model can be safely searched for and selected (which is what | 170 // ComboBox::Model can be safely searched for and selected (which is what |
| 171 // CB_SELECTSTRING does). | 171 // CB_SELECTSTRING does). |
| 172 ::SendMessage(hwnd, CB_SETCURSEL, selected_item_, 0); | 172 ::SendMessage(hwnd, CB_SETCURSEL, selected_item_, 0); |
| 173 } | 173 } |
| 174 | 174 |
| 175 int ComboBox::GetSelectedItem() { | 175 int ComboBox::GetSelectedItem() { |
| 176 return selected_item_; | 176 return selected_item_; |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace views | 179 } // namespace views |
| OLD | NEW |