diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 17:42:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 17:42:33 +0000 |
| commit | c4370ffd6c50efeb7ce9ddde0b90b564bad9961b (patch) | |
| tree | 671dcb4c41d5432742087b1c65c77e5f1e3e9b01 | |
| parent | 0508293b3bff43bd5b46afeb5451510a00cd2d98 (diff) | |
| download | chromium_src-c4370ffd6c50efeb7ce9ddde0b90b564bad9961b.zip chromium_src-c4370ffd6c50efeb7ce9ddde0b90b564bad9961b.tar.gz chromium_src-c4370ffd6c50efeb7ce9ddde0b90b564bad9961b.tar.bz2 | |
Updated include guard name
Moved constants to anonymous namespace.
BUG=chromium-os:5763
TEST=none. no functional/visual change.
Review URL: http://codereview.chromium.org/4252002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64765 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/shutdown_button.cc | 23 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/shutdown_button.h | 6 |
2 files changed, 18 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/login/shutdown_button.cc b/chrome/browser/chromeos/login/shutdown_button.cc index b677915..5e79c40 100644 --- a/chrome/browser/chromeos/login/shutdown_button.cc +++ b/chrome/browser/chromeos/login/shutdown_button.cc @@ -17,10 +17,24 @@ 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) @@ -53,13 +67,6 @@ ShutdownButton::ShutdownButton() } 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); diff --git a/chrome/browser/chromeos/login/shutdown_button.h b/chrome/browser/chromeos/login/shutdown_button.h index 20b3894..dd0a65a 100644 --- a/chrome/browser/chromeos/login/shutdown_button.h +++ b/chrome/browser/chromeos/login/shutdown_button.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_SHUTDOWN_BUTTON_H_ -#define CHROME_BROWSER_CHROMEOS_SHUTDOWN_BUTTON_H_ +#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SHUTDOWN_BUTTON_H_ +#define CHROME_BROWSER_CHROMEOS_LOGIN_SHUTDOWN_BUTTON_H_ #pragma once #include "views/controls/button/text_button.h" @@ -37,4 +37,4 @@ class ShutdownButton : public views::TextButton, } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_SHUTDOWN_BUTTON_H +#endif // CHROME_BROWSER_CHROMEOS_LOGIN_SHUTDOWN_BUTTON_H |