ui/gfx: Drop unused args from PaintMenuBackgroundColor() and pass gfx::Size instead of gfx::Rect.

This is a follow up patch to address the comments from:
http://codereview.chromium.org/9544001/diff/2007/ui/gfx/native_theme_chromeos.cc#newcode662

R=pkasting@chromium.org
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9565021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124493 0039d316-1c4b-4281-b951-d872f2087c98

ui/gfx/native_theme_aura.cc

@@ -113,15 +113,11 @@ SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const {
       break;
   }
 
-  // Return InvalidColor
   return kInvalidColorIdColor;
 }
 
-void NativeThemeAura::PaintMenuPopupBackground(
-    SkCanvas* canvas,
-    State state,
-    const gfx::Rect& rect,
-    const MenuListExtraParams& menu_list) const {
+void NativeThemeAura::PaintMenuPopupBackground(SkCanvas* canvas,
+                                               const gfx::Size& size) const {
   canvas->drawColor(kMenuBackgroundColor, SkXfermode::kSrc_Mode);
 }
 

ui/gfx/native_theme_aura.h

@@ -25,34 +25,24 @@ class NativeThemeAura : public NativeThemeBase {
   NativeThemeAura();
   virtual ~NativeThemeAura();
 
-  // NativeTheme overrides
+  // Overridden from NativeThemeBase:
   virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE;
-
-  // NativeThemeBase overrides
-  virtual void PaintMenuPopupBackground(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const MenuListExtraParams& menu_list) const OVERRIDE;
-
+  virtual void PaintMenuPopupBackground(SkCanvas* canvas,
+                                        const gfx::Size& size) const OVERRIDE;
   virtual void PaintScrollbarTrack(
       SkCanvas* canvas,
       Part part,
       State state,
       const ScrollbarTrackExtraParams& extra_params,
       const gfx::Rect& rect) const OVERRIDE;
-
-  virtual void PaintArrowButton(
-      SkCanvas* canvas,
-      const gfx::Rect& rect,
-      Part direction,
-      State state) const OVERRIDE;
-
-  virtual void PaintScrollbarThumb(
-      SkCanvas* canvas,
-      Part part,
-      State state,
-      const gfx::Rect& rect) const OVERRIDE;
+  virtual void PaintArrowButton(SkCanvas* canvas,
+                                const gfx::Rect& rect,
+                                Part direction,
+                                State state) const OVERRIDE;
+  virtual void PaintScrollbarThumb(SkCanvas* canvas,
+                                   Part part,
+                                   State state,
+                                   const gfx::Rect& rect) const OVERRIDE;
 
   SkBitmap* GetHorizontalBitmapNamed(int resource_id) const;
 

ui/gfx/native_theme_base.cc

@@ -145,7 +145,7 @@ void NativeThemeBase::Paint(SkCanvas* canvas,
       NOTIMPLEMENTED();
       break;
     case kMenuPopupBackground:
-      PaintMenuPopupBackground(canvas, state, rect, extra.menu_list);
+      PaintMenuPopupBackground(canvas, rect.size());
       break;
     case kMenuPopupGutter:
     case kMenuPopupSeparator:
@@ -666,11 +666,8 @@ void NativeThemeBase::PaintMenuList(
   canvas->drawPath(path, paint);
 }
 
-void NativeThemeBase::PaintMenuPopupBackground(
-    SkCanvas* canvas,
-    State state,
-    const gfx::Rect& rect,
-    const MenuListExtraParams& menu_list) const {
+void NativeThemeBase::PaintMenuPopupBackground(SkCanvas* canvas,
+                                               const gfx::Size& size) const {
   canvas->drawColor(kMenuPopupBackgroundColor, SkXfermode::kSrc_Mode);
 }
 

ui/gfx/native_theme_base.h

@@ -82,11 +82,8 @@ class NativeThemeBase : public NativeTheme {
       const gfx::Rect& rect,
       const MenuListExtraParams& menu_list) const;
 
-  virtual void PaintMenuPopupBackground(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const MenuListExtraParams& menu_list) const;
+  virtual void PaintMenuPopupBackground(SkCanvas* canvas,
+                                        const gfx::Size& size) const;
 
   virtual void PaintMenuItemBackground(
       SkCanvas* canvas,

ui/gfx/native_theme_chromeos.cc

@@ -661,9 +661,7 @@ void NativeThemeChromeos::PaintInnerSpinButton(SkCanvas* canvas,
 
 void NativeThemeChromeos::PaintMenuPopupBackground(
     SkCanvas* canvas,
-    State state,
-    const gfx::Rect& rect,
-    const MenuListExtraParams& menu_list) const {
+    const gfx::Size& size) const {
   static const SkColor kGradientColors[2] = {
       SK_ColorWHITE,
       SkColorSetRGB(0xF0, 0xF0, 0xF0)
@@ -676,7 +674,7 @@ void NativeThemeChromeos::PaintMenuPopupBackground(
 
   SkPoint points[2];
   points[0].iset(0, 0);
-  points[1].iset(0, rect.height());
+  points[1].iset(0, size.height());
 
   SkShader* shader = SkGradientShader::CreateLinear(points,
       kGradientColors, kGradientPoints, arraysize(kGradientPoints),
@@ -690,7 +688,7 @@ void NativeThemeChromeos::PaintMenuPopupBackground(
   paint.setStyle(SkPaint::kFill_Style);
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
-  canvas->drawRect(gfx::RectToSkRect(gfx::Rect(rect.size())), paint);
+  canvas->drawRect(gfx::RectToSkRect(gfx::Rect(size)), paint);
 }
 
 void NativeThemeChromeos::PaintProgressBar(SkCanvas* canvas,

ui/gfx/native_theme_chromeos.h

@@ -78,11 +78,8 @@ class NativeThemeChromeos : public NativeThemeBase {
       const gfx::Rect& rect,
       const InnerSpinButtonExtraParams& spin_button) const OVERRIDE;
 
-  virtual void PaintMenuPopupBackground(
-      SkCanvas* canvas,
-      State state,
-      const gfx::Rect& rect,
-      const MenuListExtraParams& menu_list) const OVERRIDE;
+  virtual void PaintMenuPopupBackground(SkCanvas* canvas,
+                                        const gfx::Size& size) const OVERRIDE;
 
   // Draw the progress bar.
   virtual void PaintProgressBar(SkCanvas* canvas,