Fix menu scroll indicators and highlights overlapping the menu border.

ui/views/controls/menu/menu_item_view.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/menu/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_image_util.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/menu_separator.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/round_rect_painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 // EmptyMenuMenuItem ---------------------------------------------------------
 
 // EmptyMenuMenuItem is used when a menu has no menu items. EmptyMenuMenuItem
 // is itself a MenuItemView, but it uses a different ID so that it isn't
@@ skipping 711 matching lines @@
   // only need the background when we want it to look different, as when we're
   // selected.
   ui::NativeTheme* native_theme = GetNativeTheme();
   SkColor override_color;
   if (delegate && delegate->GetBackgroundColor(GetCommand(),
                                                render_selection,
                                                &override_color)) {
     canvas->DrawColor(override_color);
   } else if (render_selection) {
     gfx::Rect item_bounds(0, 0, width(), height());
+    // Avoids painting over the menu border.

[sky, 2016/09/30 02:46:42]

Doesn't MenuScrollViewContainer::Layout inset by the border as necessary? Why do
you need to do it here as well?

[Bret, 2016/09/30 18:27:53]

Ok... I didn't notice that layout had some weird inset stuff going on. It
resolves to MenuConfig.menu_horizontal_border_size which is just 0... changing
it to 1 works and is cleaner, so I went with that.

+    item_bounds.Inset(views::RoundRectPainter::kBorderWidth, 0);
     AdjustBoundsForRTLUI(&item_bounds);
 
     native_theme->Paint(canvas->sk_canvas(),
                         ui::NativeTheme::kMenuItemBackground,
                         ui::NativeTheme::kHovered,
                         item_bounds,
                         ui::NativeTheme::ExtraParams());
   }
 
   const int icon_x = config.item_left_margin + left_icon_margin_;
@@ skipping 305 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views