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

Unified Diff: ui/views/controls/button/label_button.cc

Issue 309203002: Fix the appearance of Views BlueButtons with GTK theming. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « ui/views/controls/button/blue_button.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 9dd1ba94979dc1c2f7bfb7714cad9fd4101869f7..2adef130a6947b7fb3f756db9765c2b97cacf5c1 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -360,19 +360,14 @@ void LabelButton::UpdateThemedBorder() {
if (!border_is_themed_border_)
return;
- scoped_ptr<LabelButtonBorder> label_button_border = CreateDefaultBorder();
-
+ scoped_ptr<Border> border = CreateDefaultBorder().PassAs<Border>();
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
views::LinuxUI* linux_ui = views::LinuxUI::instance();
- if (linux_ui) {
- SetBorder(linux_ui->CreateNativeBorder(
- this, label_button_border.PassAs<Border>()));
- } else
+ if (linux_ui)
+ border = linux_ui->CreateNativeBorder(this, border.Pass());
#endif
- {
- SetBorder(label_button_border.PassAs<Border>());
- }
+ SetBorder(border.Pass());
border_is_themed_border_ = true;
}
« no previous file with comments | « ui/views/controls/button/blue_button.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698