Fix the appearance of Views BlueButtons with GTK theming.

ui/views/controls/button/label_button.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/throb_animation.h"
@@ skipping 342 matching lines @@
 
 void LabelButton::UpdateImage() {
   image_->SetImage(GetImage(state()));
 }
 
 void LabelButton::UpdateThemedBorder() {
   // Don't override borders set by others.
   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;
 }
 
 void LabelButton::StateChanged() {
   const gfx::Size previous_image_size(image_->GetPreferredSize());
   UpdateImage();
   const SkColor color = button_state_colors_[state()];
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
   label_->SetEnabled(state() != STATE_DISABLED);
@@ skipping 43 matching lines @@
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views