Native themes: Add menu separator part

ui/native_theme/native_theme_win.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/native_theme/native_theme_win.h"
 
 #include <windows.h>
 #include <stddef.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
@@ skipping 246 matching lines @@
                            const gfx::Rect& rect,
                            const ExtraParams& extra) const {
   if (rect.IsEmpty())
     return;
 
   switch (part) {
     case kMenuPopupGutter:
       PaintMenuGutter(canvas, rect);
       return;
     case kMenuPopupSeparator:
-      PaintMenuSeparator(canvas, rect);
+      PaintMenuSeparator(canvas, rect, extra.menu_separator);
       return;
     case kMenuPopupBackground:
       PaintMenuBackground(canvas, rect);
       return;
     case kMenuItemBackground:
       CommonThemePaintMenuItemBackground(this, canvas, state, rect,
                                          extra.menu_item);
       return;
     default:
       break;
@@ skipping 89 matching lines @@
   UpdateSystemColors();
   is_using_high_contrast_valid_ = false;
   NotifyObservers();
 }
 
 void NativeThemeWin::UpdateSystemColors() {
   for (int kSystemColor : kSystemColors)
     system_colors_[kSystemColor] = color_utils::GetSysSkColor(kSystemColor);
 }
 
-void NativeThemeWin::PaintMenuSeparator(SkCanvas* canvas,
-                                        const gfx::Rect& rect) const {
+void NativeThemeWin::PaintMenuSeparator(
+    SkCanvas* canvas,
+    const gfx::Rect& rect,
+    const MenuSeparatorExtraParams& extra) const {
   SkPaint paint;
   paint.setColor(GetSystemColor(NativeTheme::kColorId_MenuSeparatorColor));
-  int position_y = rect.y() + rect.height() / 2;
-  canvas->drawLine(rect.x(), position_y, rect.right(), position_y, paint);
+  int position_y = extra.paint_rect->y() + extra.paint_rect->height() / 2;
+  canvas->drawLine(extra.paint_rect->x(), position_y, extra.paint_rect->right(),
+                   position_y, paint);
 }
 
 void NativeThemeWin::PaintMenuGutter(SkCanvas* canvas,
                                      const gfx::Rect& rect) const {
   SkPaint paint;
   paint.setColor(GetSystemColor(NativeTheme::kColorId_MenuSeparatorColor));
   int position_x = rect.x() + rect.width() / 2;
   canvas->drawLine(position_x, rect.y(), position_x, rect.bottom(), paint);
 }
 
@@ skipping 29 matching lines @@
     case kMenuPopupArrow:
       PaintMenuArrow(hdc, state, rect, extra.menu_arrow);
       return;
     case kMenuPopupBackground:
       PaintMenuBackground(hdc, rect);
       return;
     case kMenuPopupGutter:
       PaintMenuGutter(hdc, rect);
       return;
     case kMenuPopupSeparator:
-      PaintMenuSeparator(hdc, rect);
+      PaintMenuSeparator(hdc, rect, extra.menu_separator);
       return;
     case kMenuItemBackground:
       PaintMenuItemBackground(hdc, state, rect, extra.menu_item);
       return;
     case kProgressBar:
       PaintProgressBar(hdc, rect, extra.progress_bar);
       return;
     case kPushButton:
       PaintPushButton(hdc, part, state, rect, extra.button);
       return;
@@ skipping 418 matching lines @@
     InflateRect(&inner_rect, -padding, -padding);
     int color_index = state == kDisabled ? COLOR_GRAYTEXT : COLOR_WINDOWTEXT;
     FillRect(hdc, &inner_rect, GetSysColorBrush(color_index));
   }
 
   return S_OK;
 }
 
 HRESULT NativeThemeWin::PaintMenuSeparator(
     HDC hdc,
-    const gfx::Rect& rect) const {
-  RECT rect_win = rect.ToRECT();
+    const gfx::Rect& rect,
+    const MenuSeparatorExtraParams& extra) const {
+  RECT rect_win = extra.paint_rect->ToRECT();
 
   HANDLE handle = GetThemeHandle(MENU);
   if (handle && draw_theme_) {
     // Delta is needed for non-classic to move separator up slightly.
     --rect_win.top;
     --rect_win.bottom;
     return draw_theme_(handle, hdc, MENU_POPUPSEPARATOR, MPI_NORMAL, &rect_win,
                        NULL);
   }
 
@@ skipping 1219 matching lines @@
     break;
   case LAST:
     NOTREACHED();
     break;
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui