summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authordilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 13:22:36 +0000
committerdilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 13:22:36 +0000
commit0117fe60627af21b7ba9026329a1ca70ffa0b00a (patch)
treee0ed8bc163d6574e5d8d7cffd751151e2a9a06b6 /chrome/browser
parent3231c2ecdbba6e6978b988f47a495f9bb45462b9 (diff)
downloadchromium_src-0117fe60627af21b7ba9026329a1ca70ffa0b00a.zip
chromium_src-0117fe60627af21b7ba9026329a1ca70ffa0b00a.tar.gz
chromium_src-0117fe60627af21b7ba9026329a1ca70ffa0b00a.tar.bz2
Style fixes for recent CL r58341
BUG=http://crosbug.org/5756 TEST=Manual Review URL: http://codereview.chromium.org/3297005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/login/rounded_rect_painter.cc10
-rw-r--r--chrome/browser/chromeos/login/rounded_rect_painter.h1
-rw-r--r--chrome/browser/chromeos/login/user_controller.cc11
3 files changed, 15 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc
index b134cce..9f025b1 100644
--- a/chrome/browser/chromeos/login/rounded_rect_painter.cc
+++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc
@@ -236,6 +236,16 @@ const BorderDefinition BorderDefinition::kScreenBorder = {
kScreenBottomColor
};
+const BorderDefinition BorderDefinition::kUserBorder = {
+ 0,
+ SK_ColorBLACK,
+ 0,
+ kScreenShadowColor,
+ kCornerRadius,
+ kScreenTopColor,
+ kScreenBottomColor
+};
+
views::Painter* CreateWizardPainter(const BorderDefinition* const border) {
return new RoundedRectPainter(border);
}
diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.h b/chrome/browser/chromeos/login/rounded_rect_painter.h
index ce7661f..4bd36ec 100644
--- a/chrome/browser/chromeos/login/rounded_rect_painter.h
+++ b/chrome/browser/chromeos/login/rounded_rect_painter.h
@@ -26,6 +26,7 @@ struct BorderDefinition {
SkColor bottom_color;
static const BorderDefinition kScreenBorder;
+ static const BorderDefinition kUserBorder;
};
// Creates painter to paint view background with parameters specified.
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 0c08485..7ac62a7 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -345,13 +345,10 @@ void UserController::CreateBorderWindow(int index,
border_window_ = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
border_window_->MakeTransparent();
border_window_->Init(NULL, gfx::Rect(0, 0, width, height));
- {
- static BorderDefinition borderDef = BorderDefinition::kScreenBorder;
- borderDef.shadow = 0;
- views::Painter* painter = CreateWizardPainter(&borderDef);
- border_window_->GetRootView()->set_background(
- views::Background::CreateBackgroundPainter(true, painter));
- }
+ views::Painter* painter = CreateWizardPainter(
+ &BorderDefinition::kUserBorder);
+ border_window_->GetRootView()->set_background(
+ views::Background::CreateBackgroundPainter(true, painter));
UpdateUserCount(index, total_user_count);
GdkWindow* gdk_window = border_window_->GetNativeView()->window;