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"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/focusable_border.h"
+#include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Define the size of the insets.
 const int kTopInsetSize = 4;
 const int kLeftInsetSize = 4;
@@ skipping 19 matching lines @@
 
 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 248 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
-
   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() +
+                      MenuConfig::instance().menu_border_width_left);

[sky, 2012/08/07 20:50:01]

Now that this code is entirely here it doesn't make sense for the constants to
be in MenuCOnfig. Move them back here.

[Harry McCleave, 2012/08/07 22:08:08]

Done.

+  menu_position.set_y(menu_position.y() +
+                      MenuConfig::instance().menu_border_width_top);
+  lb.set_width(lb.width() - (MenuConfig::instance().menu_border_width_left +
+                MenuConfig::instance().menu_border_width_right));
+
   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