Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: views/controls/button/text_button.cc

Issue 7196002: Fix checkbox in windows uninstaller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Uploading after sync merge Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/button/checkbox.cc ('k') | views/examples/native_theme_button_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/button/text_button.cc
===================================================================
--- views/controls/button/text_button.cc (revision 90572)
+++ views/controls/button/text_button.cc (working copy)
@@ -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 @@
}
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 @@
}
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 {
« no previous file with comments | « views/controls/button/checkbox.cc ('k') | views/examples/native_theme_button_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698