| Index: chrome/browser/chromeos/login/user_image_view.cc
|
| diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc
|
| index 9b0e2e7ba95565e745ba7eff72d6e2265568f787..d05e0fe5466a94acf2aba9c3af8966231da8ed29 100644
|
| --- a/chrome/browser/chromeos/login/user_image_view.cc
|
| +++ b/chrome/browser/chromeos/login/user_image_view.cc
|
| @@ -130,9 +130,9 @@ class CameraImageView : public views::ImageView {
|
| gfx::Size message_size = message_->GetPreferredSize();
|
| int message_y = size.height() - kVerticalMargin - message_size.height();
|
| message_->SetBounds(kHorizontalMargin,
|
| - message_y,
|
| - message_size.width(),
|
| - message_size.height());
|
| + message_y,
|
| + message_size.width(),
|
| + message_size.height());
|
| }
|
| }
|
|
|
| @@ -241,7 +241,11 @@ void UserImageView::InitLayout() {
|
|
|
| // Fill the layout with rows and views now.
|
| layout->StartRowWithPadding(0, kTitleRow, 0, kVerticalMargin);
|
| - layout->AddView(title_label_);
|
| + layout->AddView(title_label_,
|
| + 1,
|
| + 1,
|
| + views::GridLayout::FILL, // For multi-line support.
|
| + views::GridLayout::LEADING);
|
| layout->StartRowWithPadding(0, kImageRow, 0, kVerticalPadding);
|
| layout->AddView(user_image_);
|
| layout->StartRowWithPadding(1, kImageRow, 0, kVerticalPadding);
|
|
|