Index: ui/views/controls/combobox/native_combobox_views.cc |
diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc |
index e0032c30986a737c102b6d88815f6ef45f1ba760..66d88a7d985af22d8652270f2eb448f500749651 100644 |
--- a/ui/views/controls/combobox/native_combobox_views.cc |
+++ b/ui/views/controls/combobox/native_combobox_views.cc |
@@ -57,7 +57,7 @@ NativeComboboxViews::NativeComboboxViews(Combobox* combobox) |
: combobox_(combobox), |
text_border_(new FocusableBorder()), |
disclosure_arrow_(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
- IDR_DISCLOSURE_ARROW).ToImageSkia()), |
sky
2012/08/06 22:57:59
Update the grd file and remove the image too.
Harry McCleave
2012/08/06 23:41:27
Done.
|
+ IDR_MENU_DROPARROW).ToImageSkia()), |
dropdown_open_(false), |
selected_index_(-1), |
content_width_(0), |
@@ -326,11 +326,6 @@ void NativeComboboxViews::ShowDropDownMenu() { |
SubmenuView* submenu = menu->CreateSubmenu(); |
submenu->set_minimum_preferred_width(size().width()); |
-#if defined(USE_AURA) |
- // Aura style is to have the menu over the bounds. Below bounds is default. |
- menu->set_menu_position(views::MenuItemView::POSITION_OVER_BOUNDS); |
sky
2012/08/06 22:57:59
This code only exists for aura. IF it's not needed
Harry McCleave
2012/08/06 23:41:27
Done? (is the mergeing of [requested|actual]_menu_
|
-#endif |
- |
gfx::Rect lb = GetLocalBounds(); |
gfx::Point menu_position(lb.origin()); |
View::ConvertPointToScreen(this, &menu_position); |