Aura: Use same views menu setup on win_aura and linux_aura

Resolves some TODOs I added in menu_config_win.cc and menu_item_view_win.cc, and harmonizes our menu rendering code between windows and linux Aura.

BUG=100586
TEST=manual

Review URL: http://codereview.chromium.org/8302017

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

1 files changed, 34 insertions, 11 deletions

diff --git a/ui/gfx/native_theme_base.h b/ui/gfx/native_theme_base.h
index 3a29700..351486c 100644
--- a/ui/gfx/native_theme_base.h
+++ b/ui/gfx/native_theme_base.h
@@ -38,58 +38,81 @@ class NativeThemeBase : public NativeTheme {
       State state) const;
   // Paint the scrollbar track. Done before the thumb so that it can contain
   // alpha.
-  virtual void PaintScrollbarTrack(SkCanvas* canvas,
+  virtual void PaintScrollbarTrack(
+      SkCanvas* canvas,
       Part part,
       State state,
       const ScrollbarTrackExtraParams& extra_params,
       const gfx::Rect& rect) const;
   // Draw the scrollbar thumb over the track.
-  virtual void PaintScrollbarThumb(SkCanvas* canvas,
+  virtual void PaintScrollbarThumb(
+      SkCanvas* canvas,
       Part part,
       State state,
       const gfx::Rect& rect) const;
 
-  virtual void PaintCheckbox(SkCanvas* canvas,
+  virtual void PaintCheckbox(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const ButtonExtraParams& button) const;
 
-  virtual void PaintRadio(SkCanvas* canvas,
+  virtual void PaintRadio(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const ButtonExtraParams& button) const;
 
-  virtual void PaintButton(SkCanvas* canvas,
+  virtual void PaintButton(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const ButtonExtraParams& button) const;
 
-  virtual void PaintTextField(SkCanvas* canvas,
+  virtual void PaintTextField(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const TextFieldExtraParams& text) const;
 
-  virtual void PaintMenuList(SkCanvas* canvas,
+  virtual void PaintMenuList(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const MenuListExtraParams& menu_list) const;
 
-  virtual void PaintSliderTrack(SkCanvas* canvas,
+  virtual void PaintMenuPopupBackground(
+      SkCanvas* canvas,
+      State state,
+      const gfx::Rect& rect,
+      const MenuListExtraParams& menu_list) const;
+
+  virtual void PaintMenuItemBackground(
+      SkCanvas* canvas,
+      State state,
+      const gfx::Rect& rect,
+      const MenuListExtraParams& menu_list) const;
+
+  virtual void PaintSliderTrack(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const SliderExtraParams& slider) const;
 
-  virtual void PaintSliderThumb(SkCanvas* canvas,
+  virtual void PaintSliderThumb(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const SliderExtraParams& slider) const;
 
-  virtual void PaintInnerSpinButton(SkCanvas* canvas,
+  virtual void PaintInnerSpinButton(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const InnerSpinButtonExtraParams& spin_button) const;
 
-  virtual void PaintProgressBar(SkCanvas* canvas,
+  virtual void PaintProgressBar(
+      SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
       const ProgressBarExtraParams& progress_bar) const;