ash: Prevent negative sizes.

ash: Prevent negative sizes.

Use std::max(0, ) to bound sizes at 0.

TBR=sky
BUG=160158
Relanding https://codereview.chromium.org/11365160/ in pieces.


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=178219

[commit-bot: I haz the power, 2013-01-22 23:07:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/12052016/1

[commit-bot: I haz the power, 2013-01-22 23:07:32]

Failed to apply patch for ash/system/user/tray_user.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/system/user/tray_user.cc
  Hunk #1 FAILED at 432.
  1 out of 1 hunk FAILED -- saving rejects to file
ash/system/user/tray_user.cc.rej

Patch:       ash/system/user/tray_user.cc
Index: ash/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index
f4338879f5d824603d66e52247badd5acb17c462..de5f7cbd7fc34f637a19ff3324f2cf2ad52c3c73
100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -432,8 +432,9 @@ void UserView::Layout() {
 
     // Give the remaining space to the user card.
     gfx::Rect user_card_area = contents_area;
-    user_card_area.set_width(contents_area.width() -
-        (logout_area.width() + kTrayPopupPaddingBetweenItems));
+    int remaining_width = contents_area.width() -
+        (logout_area.width() + kTrayPopupPaddingBetweenItems);
+    user_card_area.set_width(std::max(0, remaining_width));
     user_card_->SetBoundsRect(user_card_area);
   } else if (user_card_) {
     user_card_->SetBoundsRect(contents_area);

[commit-bot: I haz the power, 2013-01-23 00:03:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/12052016/1

[commit-bot: I haz the power, 2013-01-23 02:45:04]

Change committed as 178219