step 4 of native theme refactoring

Moved all calls made by webthemeengine_impl_win.cc from the old api to the
new api.

BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6873047

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

1 files changed, 48 insertions, 24 deletions

diff --git a/ui/gfx/native_theme.h b/ui/gfx/native_theme.h
index 9c2f83f..d1c6020 100644
--- a/ui/gfx/native_theme.h
+++ b/ui/gfx/native_theme.h
@@ -41,6 +41,8 @@ class NativeTheme {
     kScrollbarVerticalThumb,
     kScrollbarHorizontalTrack,
     kScrollbarVerticalTrack,
+    kScrollbarHorizontalGripper,
+    kScrollbarVerticalGripper,
     kCheckbox,
     kRadio,
     kPushButton,
@@ -57,6 +59,8 @@ class NativeTheme {
     kSliderThumb,
     kInnerSpinButton,
     kProgressBar,
+    kTrackbarThumb,
+    kTrackbarTrack,
     kMaxPart,
   };
 
@@ -69,16 +73,9 @@ class NativeTheme {
     kMaxState,
   };
 
-  // Each structure below hold extra information needed when painting a given
+  // Each structure below holds extra information needed when painting a given
   // part.
 
-  struct ScrollbarTrackExtraParams {
-    int track_x;
-    int track_y;
-    int track_width;
-    int track_height;
-  };
-
   struct ButtonExtraParams {
     bool checked;
     bool indeterminate;  // Whether the button state is indeterminate.
@@ -88,10 +85,10 @@ class NativeTheme {
     SkColor background_color;
   };
 
-  struct TextFieldExtraParams {
-    bool is_text_area;
-    bool is_listbox;
-    SkColor background_color;
+  struct InnerSpinButtonExtraParams {
+    bool spin_up;
+    bool read_only;
+    int classic_state;  // Used on Windows when uxtheme is not available.
   };
 
   struct MenuArrowExtraParams {
@@ -112,42 +109,69 @@ class NativeTheme {
     int arrow_x;
     int arrow_y;
     SkColor background_color;
+    int classic_state;  // Used on Windows when uxtheme is not available.
   };
 
   struct MenuSeparatorExtraParams {
     bool has_gutter;
   };
 
+  struct ProgressBarExtraParams {
+    double animated_seconds;
+    bool determinate;
+    int value_rect_x;
+    int value_rect_y;
+    int value_rect_width;
+    int value_rect_height;
+  };
+
+  struct ScrollbarArrowExtraParams {
+    bool is_hovering;
+  };
+
+  struct ScrollbarTrackExtraParams {
+    bool is_upper;
+    int track_x;
+    int track_y;
+    int track_width;
+    int track_height;
+    int classic_state;  // Used on Windows when uxtheme is not available.
+  };
+
+  struct ScrollbarThumbExtraParams {
+    bool is_hovering;
+  };
+
   struct SliderExtraParams {
     bool vertical;
     bool in_drag;
   };
 
-  struct InnerSpinButtonExtraParams {
-    bool spin_up;
-    bool read_only;
+  struct TextFieldExtraParams {
+    bool is_text_area;
+    bool is_listbox;
+    SkColor background_color;
   };
 
-  struct ProgressBarExtraParams {
-    bool determinate;
-    int value_rect_x;
-    int value_rect_y;
-    int value_rect_width;
-    int value_rect_height;
+  struct TrackbarExtraParams {
+    int classic_state;  // Used on Windows when uxtheme is not available.
   };
 
   union ExtraParams {
-    ScrollbarTrackExtraParams scrollbar_track;
     ButtonExtraParams button;
+    InnerSpinButtonExtraParams inner_spin;
     MenuArrowExtraParams menu_arrow;
     MenuCheckExtraParams menu_check;
     MenuItemExtraParams menu_item;
     MenuListExtraParams menu_list;
     MenuSeparatorExtraParams menu_separator;
+    ProgressBarExtraParams progress_bar;
+    ScrollbarArrowExtraParams scrollbar_arrow;
+    ScrollbarTrackExtraParams scrollbar_track;
+    ScrollbarThumbExtraParams scrollbar_thumb;
     SliderExtraParams slider;
     TextFieldExtraParams text_field;
-    InnerSpinButtonExtraParams inner_spin;
-    ProgressBarExtraParams progress_bar;
+    TrackbarExtraParams trackbar;
   };
 
   // Return the size of the part.