| Index: ui/views/controls/menu/menu_scroll_view_container.cc
|
| diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
|
| index 7b8edbecab5fc43bbb34258dbf5e17a59a7d36c5..5bb0a4aaa103f97c6bc1850bd3fc09deddaf48e0 100644
|
| --- a/ui/views/controls/menu/menu_scroll_view_container.cc
|
| +++ b/ui/views/controls/menu/menu_scroll_view_container.cc
|
| @@ -299,13 +299,14 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
|
| int right = menu_config.menu_horizontal_border_size + padding;
|
|
|
| if (use_border) {
|
| - set_border(views::Border::CreateBorderPainter(
|
| - new views::RoundRectPainter(menu_config.native_theme->GetSystemColor(
|
| + SetBorder(views::Border::CreateBorderPainter(
|
| + new views::RoundRectPainter(
|
| + menu_config.native_theme->GetSystemColor(
|
| ui::NativeTheme::kColorId_MenuBorderColor),
|
| menu_config.corner_radius),
|
| - gfx::Insets(top, left, bottom, right)));
|
| + gfx::Insets(top, left, bottom, right)));
|
| } else {
|
| - set_border(Border::CreateEmptyBorder(top, left, bottom, right));
|
| + SetBorder(Border::CreateEmptyBorder(top, left, bottom, right));
|
| }
|
| }
|
|
|
| @@ -313,7 +314,7 @@ void MenuScrollViewContainer::CreateBubbleBorder() {
|
| bubble_border_ = new BubbleBorder(arrow_,
|
| BubbleBorder::SMALL_SHADOW,
|
| SK_ColorWHITE);
|
| - set_border(bubble_border_);
|
| + SetBorder(scoped_ptr<Border>(bubble_border_));
|
| set_background(new BubbleBackground(bubble_border_));
|
| }
|
|
|
|
|