Change Views menus to consistently use GetNativeTheme for theming.

ui/views/controls/menu/menu_scroll_view_container.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_scroll_view_container.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/round_rect_painter.h"
 
 using ui::NativeTheme;
 
@@ skipping 173 matching lines @@
 
 bool MenuScrollViewContainer::HasBubbleBorder() {
   return arrow_ != BubbleBorder::NONE;
 }
 
 void MenuScrollViewContainer::SetBubbleArrowOffset(int offset) {
   DCHECK(HasBubbleBorder());
   bubble_border_->set_arrow_offset(offset);
 }
 
-void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
-  if (background()) {
-    View::OnPaintBackground(canvas);
-    return;
-  }
-
-  gfx::Rect bounds(0, 0, width(), height());
-  NativeTheme::ExtraParams extra;
-  const MenuConfig& menu_config = content_view_->GetMenuItem()->GetMenuConfig();
-  extra.menu_background.corner_radius = menu_config.corner_radius;
-  GetNativeTheme()->Paint(canvas->sk_canvas(),
-      NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);
+gfx::Size MenuScrollViewContainer::GetPreferredSize() const {
+  gfx::Size prefsize = scroll_view_->GetContents()->GetPreferredSize();
+  gfx::Insets insets = GetInsets();
+  prefsize.Enlarge(insets.width(), insets.height());
+  return prefsize;
 }
 
 void MenuScrollViewContainer::Layout() {
   gfx::Insets insets = GetInsets();
   int x = insets.left();
   int y = insets.top();
   int width = View::width() - insets.width();
   int content_height = height() - insets.height();
   if (!scroll_up_button_->visible()) {
     scroll_view_->SetBounds(x, y, width, content_height);
     scroll_view_->Layout();
     return;
   }
 
   gfx::Size pref = scroll_up_button_->GetPreferredSize();
   scroll_up_button_->SetBounds(x, y, width, pref.height());
   content_height -= pref.height();
 
   const int scroll_view_y = y + pref.height();
 
   pref = scroll_down_button_->GetPreferredSize();
   scroll_down_button_->SetBounds(x, height() - pref.height() - insets.top(),
                                  width, pref.height());
   content_height -= pref.height();
 
   scroll_view_->SetBounds(x, scroll_view_y, width, content_height);
   scroll_view_->Layout();
 }
 
-gfx::Size MenuScrollViewContainer::GetPreferredSize() const {
-  gfx::Size prefsize = scroll_view_->GetContents()->GetPreferredSize();
-  gfx::Insets insets = GetInsets();
-  prefsize.Enlarge(insets.width(), insets.height());
-  return prefsize;
+void MenuScrollViewContainer::OnNativeThemeChanged(
+    const ui::NativeTheme* theme) {
+  if (arrow_ == BubbleBorder::NONE)
+    CreateDefaultBorder();
+}
+
+void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
+  if (background()) {
+    View::OnPaintBackground(canvas);
+    return;
+  }
+
+  gfx::Rect bounds(0, 0, width(), height());
+  NativeTheme::ExtraParams extra;
+  const MenuConfig& menu_config = content_view_->GetMenuItem()->GetMenuConfig();
+  extra.menu_background.corner_radius = menu_config.corner_radius;
+  GetNativeTheme()->Paint(canvas->sk_canvas(),
+      NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);
 }
 
 void MenuScrollViewContainer::GetAccessibleState(
     ui::AXViewState* state) {
   // Get the name from the submenu view.
   content_view_->GetAccessibleState(state);
 
   // Now change the role.
   state->role = ui::AX_ROLE_MENU_BAR;
   // Some AT (like NVDA) will not process focus events on menu item children
   // unless a parent claims to be focused.
   state->AddStateFlag(ui::AX_STATE_FOCUSED);
 }
 
 void MenuScrollViewContainer::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   gfx::Size content_pref = scroll_view_->GetContents()->GetPreferredSize();
   scroll_up_button_->SetVisible(content_pref.height() > height());
   scroll_down_button_->SetVisible(content_pref.height() > height());
   Layout();
 }
 
 void MenuScrollViewContainer::CreateDefaultBorder() {
-  arrow_ = BubbleBorder::NONE;
-  bubble_border_ = NULL;
+  DCHECK_EQ(arrow_, BubbleBorder::NONE);
+  bubble_border_ = nullptr;
 
   const MenuConfig& menu_config =
       content_view_->GetMenuItem()->GetMenuConfig();
 
   int padding = menu_config.use_outer_border && menu_config.corner_radius > 0
                     ? kBorderPaddingDueToRoundedCorners
                     : 0;
 
   int top = menu_config.menu_vertical_border_size + padding;
   int left = menu_config.menu_horizontal_border_size + padding;
   int bottom = menu_config.menu_vertical_border_size + padding;
   int right = menu_config.menu_horizontal_border_size + padding;
 
   if (menu_config.use_outer_border) {
+    SkColor color = GetNativeTheme()
+                        ? GetNativeTheme()->GetSystemColor(
+                              ui::NativeTheme::kColorId_MenuBorderColor)
+                        : gfx::kPlaceholderColor;
     SetBorder(views::Border::CreateBorderPainter(
-        new views::RoundRectPainter(
-            menu_config.native_theme->GetSystemColor(
-                ui::NativeTheme::kColorId_MenuBorderColor),
-            menu_config.corner_radius),
+        new views::RoundRectPainter(color, menu_config.corner_radius),
         gfx::Insets(top, left, bottom, right)));
   } else {
     SetBorder(Border::CreateEmptyBorder(top, left, bottom, right));
   }
 }
 
 void MenuScrollViewContainer::CreateBubbleBorder() {
   bubble_border_ = new BubbleBorder(arrow_,
                                     BubbleBorder::SMALL_SHADOW,
                                     SK_ColorWHITE);
@@ skipping 11 matching lines @@
     case MENU_ANCHOR_BUBBLE_ABOVE:
       return BubbleBorder::BOTTOM_CENTER;
     case MENU_ANCHOR_BUBBLE_BELOW:
       return BubbleBorder::TOP_CENTER;
     default:
       return BubbleBorder::NONE;
   }
 }
 
 }  // namespace views