address comments in CL 4054001

chrome/browser/chromeos/login/shutdown_button.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/shutdown_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/background.h"
 
 namespace {
 
-// Bottom/Right Padding for Shutdown button.
+// Style parameters for Shutdown button.
+
+// Bottom/Right padding to locale the shutdown button.
 const int kBottomPadding = 12;
 const int kRightPadding = 12;
 
+// Normal/Hover colors.
+const SkColor kButtonColor = 0xFF242A35;
+const SkColor kHoverColor = 0xFF353E4E;
+
+// Padding inside button.
+const int kVerticalPadding = 13;
+const int kIconTextPadding = 10;
+const int kHorizontalPadding = 13;
+
+// Rounded corner radious.
+const int kCornerRadius = 4;
+
 class HoverBackground : public views::Background {
  public:
   HoverBackground(views::Background* normal, views::Background* hover)
       : normal_(normal), hover_(hover) {
   }
 
   // views::Background implementation.
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const {
     views::TextButton* button = static_cast<views::TextButton*>(view);
     if (button->state() == views::CustomButton::BS_HOT) {
@@ skipping 12 matching lines @@
 
 }  // namespace
 
 namespace chromeos {
 
 ShutdownButton::ShutdownButton()
     : ALLOW_THIS_IN_INITIALIZER_LIST(TextButton(this, std::wstring())) {
 }
 
 void ShutdownButton::Init() {
-  SkColor kButtonColor = 0xFF242A35;
-  SkColor kHoverColor = 0xFF353E4E;
-  int kVerticalPadding = 13;
-  int kIconTextPadding = 10;
-  int kHorizontalPadding = 13;
-  int kCornerRadius = 4;
-
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SetIcon(*rb.GetBitmapNamed(IDR_SHUTDOWN_ICON));
   set_icon_text_spacing(kIconTextPadding);
   SetFocusable(true);
   // Set label colors.
   SetEnabledColor(SK_ColorWHITE);
   SetDisabledColor(SK_ColorWHITE);
   SetHighlightColor(SK_ColorWHITE);
   SetHoverColor(SK_ColorWHITE);
   // Disable throbbing and make border always visible.
@@ skipping 42 matching lines @@
   return gdk_cursor_new(GDK_HAND2);
 }
 
 void ShutdownButton::ButtonPressed(views::Button* sender,
                                    const views::Event& event) {
   DCHECK(CrosLibrary::Get()->EnsureLoaded());
   CrosLibrary::Get()->GetPowerLibrary()->RequestShutdown();
 }
 
 }  // namespace chromeos