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

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

Issue 292153008: linux_aura: Fix the insets on LabelButtons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to a chain of CreateDefaultBorder()s instead. 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
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 fd9d5641d5e38fca453140e5d9bbd386092723fb..9dd1ba94979dc1c2f7bfb7714cad9fd4101869f7 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -266,8 +266,8 @@ const char* LabelButton::GetClassName() const {
return kViewClassName;
}
-scoped_ptr<Border> LabelButton::CreateDefaultBorder() const {
- return scoped_ptr<Border>(new LabelButtonBorder(style_));
+scoped_ptr<LabelButtonBorder> LabelButton::CreateDefaultBorder() const {
+ return scoped_ptr<LabelButtonBorder>(new LabelButtonBorder(style_));
}
void LabelButton::SetBorder(scoped_ptr<Border> border) {
@@ -360,16 +360,17 @@ void LabelButton::UpdateThemedBorder() {
if (!border_is_themed_border_)
return;
- scoped_ptr<Border> label_button_border = CreateDefaultBorder();
+ scoped_ptr<LabelButtonBorder> label_button_border = CreateDefaultBorder();
#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.Pass()));
+ SetBorder(linux_ui->CreateNativeBorder(
+ this, label_button_border.PassAs<Border>()));
} else
#endif
{
- SetBorder(label_button_border.Pass());
+ SetBorder(label_button_border.PassAs<Border>());
}
border_is_themed_border_ = true;
« chrome/browser/ui/views/toolbar/toolbar_button.h ('K') | « ui/views/controls/button/label_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698