Fix checkbox in windows uninstaller.

BUG=84791
TEST=Test the checkbox in the uninstaller as mentioned in the bug, but also
all checkboxes in chrome too.

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

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

3 files changed, 15 insertions, 7 deletions

diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index fe33428..91e7f79 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -300,7 +300,6 @@ gfx::Rect Checkbox::GetThemePaintRect() const {
 
 void Checkbox::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
   TextButtonBase::GetExtraParams(params);
-  params->button.is_default = false;
   params->button.checked = checked_;
 }
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index f85a887..5ad963b 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -17,6 +17,7 @@
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
+#include "ui/gfx/native_theme_win.h"
 #include "ui/gfx/platform_font_win.h"
 #endif
 
@@ -607,7 +608,12 @@ gfx::NativeTheme::State TextButtonBase::GetThemeState(
 }
 
 const ui::Animation* TextButtonBase::GetThemeAnimation() const {
+#if defined(OS_WIN)
+  return gfx::NativeThemeWin::instance()->IsThemingActive()
+      ? hover_animation_.get() : NULL;
+#else
   return hover_animation_.get();
+#endif
 }
 
 gfx::NativeTheme::State TextButtonBase::GetBackgroundThemeState(
@@ -726,12 +732,8 @@ gfx::NativeTheme::Part TextButton::GetThemePart() const {
 }
 
 void TextButton::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
-  params->button.checked = false;
-  params->button.indeterminate = false;
+  TextButtonBase::GetExtraParams(params);
   params->button.is_default = is_default_;
-  params->button.has_border = false;
-  params->button.classic_state = 0;
-  params->button.background_color = kEnabledColor;
 }
 
 gfx::Rect TextButton::GetTextBounds() const {
diff --git a/views/examples/native_theme_button_example.cc b/views/examples/native_theme_button_example.cc
index 7810b04..1b20281 100644
--- a/views/examples/native_theme_button_example.cc
+++ b/views/examples/native_theme_button_example.cc
@@ -137,7 +137,14 @@ gfx::NativeTheme::Part ExampleNativeThemeButton::GetThemePart() const {
 }
 
 gfx::Rect ExampleNativeThemeButton::GetThemePaintRect() const {
-  return GetLocalBounds();
+  gfx::NativeTheme::ExtraParams extra;
+  gfx::NativeTheme::State state = GetThemeState(&extra);
+  gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
+                                                           state,
+                                                           extra));
+  gfx::Rect rect(size);
+  rect.set_x(GetMirroredXForRect(rect));
+  return rect;
 }
 
 gfx::NativeTheme::State ExampleNativeThemeButton::GetThemeState(