Update drop down menu look & feel

ui/views/controls/combobox/native_combobox_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 13 matching lines @@
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Define the size of the insets.
 const int kTopInsetSize = 4;
 const int kLeftInsetSize = 4;
 const int kBottomInsetSize = 4;
 const int kRightInsetSize = 4;
 
+// Menu border widths
+const int kMenuBorderWidthLeft = 1;
+const int kMenuBorderWidthTop = 2;
+const int kMenuBorderWidthRight = 1;
+const int kMenuBorderWidthBottom = 2;
+
 // Limit how small a combobox can be.
 const int kMinComboboxWidth = 148;
 
 // Size of the combobox arrow margins
 const int kDisclosureArrowLeftPadding = 7;
 const int kDisclosureArrowRightPadding = 7;
 
 // Color settings for text and border.
 // These are tentative, and should be derived from theme, system
 // settings and current settings.
 const SkColor kTextColor = SK_ColorBLACK;
 
 // Define the id of the first item in the menu (since it needs to be > 0)
 const int kFirstMenuItemId = 1000;
 
 }  // namespace
 
 namespace views {
 
 const char NativeComboboxViews::kViewClassName[] =
     "views/NativeComboboxViews";
 
 NativeComboboxViews::NativeComboboxViews(Combobox* combobox)
     : combobox_(combobox),
       text_border_(new FocusableBorder()),
       disclosure_arrow_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_DISCLOSURE_ARROW).ToImageSkia()),
+          IDR_MENU_DROPARROW).ToImageSkia()),
       dropdown_open_(false),
       selected_index_(-1),
       content_width_(0),
       content_height_(0) {
   set_border(text_border_);
 }
 
 NativeComboboxViews::~NativeComboboxViews() {
 }
 
@@ skipping 246 matching lines @@
 }
 
 void NativeComboboxViews::ShowDropDownMenu() {
 
   if (!dropdown_list_menu_runner_.get())
     UpdateFromModel();
 
   // Extend the menu to the width of the combobox.
   MenuItemView* menu = dropdown_list_menu_runner_->GetMenu();
   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);
-#endif
+  submenu->set_minimum_preferred_width(size().width() -
+                                (kMenuBorderWidthLeft + kMenuBorderWidthRight));
 
   gfx::Rect lb = GetLocalBounds();
   gfx::Point menu_position(lb.origin());
+
+  // Inset the menu's requested position so the border of the menu lines up
+  // with the border of the combobox.
+  menu_position.set_x(menu_position.x() + kMenuBorderWidthLeft);
+  menu_position.set_y(menu_position.y() + kMenuBorderWidthTop);
+  lb.set_width(lb.width() - (kMenuBorderWidthLeft + kMenuBorderWidthRight));
+
   View::ConvertPointToScreen(this, &menu_position);
   if (menu_position.x() < 0)
       menu_position.set_x(0);
 
   gfx::Rect bounds(menu_position, lb.size());
 
   dropdown_open_ = true;
   if (dropdown_list_menu_runner_->RunMenuAt(
           GetWidget(), NULL, bounds, MenuItemView::TOPLEFT,
           MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
@@ skipping 11 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views