ash: Long network names should not overlap with the chevron in the uber tray.

ash: Long network names should not overlap with the chevron in the uber tray.

Also add a fix to not show the update notification when there is no update.

BUG=120651
TEST=none

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

[Ben Goodger (Google), 2012-03-28 16:51:17]

LGTM

On Wed, Mar 28, 2012 at 9:19 AM, <sadrul@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> ash: Long network names should not overlap with the chevron in the uber
> tray.
>
> Also add a fix to not show the update notification when there is no update.
>
> BUG=120651
> TEST=none
>
>
> Please review this at
http://codereview.chromium.**org/9874022/<http://codereview.chromium.org/9874...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ash/system/tray/tray_item_**more.cc
>  M ash/system/tray_update.cc
>
>
> Index: ash/system/tray/tray_item_**more.cc
> diff --git a/ash/system/tray/tray_item_**more.cc
> b/ash/system/tray/tray_item_**more.cc
> index bcf666e13a8810fe7efcd48e7b31c0**961960cee5..**
> 13ce3c49d6470efc2c33c20e864f2f**5762b4b194 100644
> --- a/ash/system/tray/tray_item_**more.cc
> +++ b/ash/system/tray/tray_item_**more.cc
> @@ -74,7 +74,9 @@ void TrayItemMore::Layout() {
>
>   // Adjust the label's bounds in case it got cut off by |more_|.
>   if (label_->bounds().Intersects(**more_->bounds())) {
> -    label_->SetBoundsRect(label_->**bounds().Subtract(more_->**
> bounds()));
> +    gfx::Rect bounds = label_->bounds();
> +    bounds.set_width(more_->x() - kTrayPopupPaddingBetweenItems -
> label_->x());
> +    label_->SetBoundsRect(bounds);
>   }
>  }
>
> Index: ash/system/tray_update.cc
> diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
> index 315f1ce9b8096b02c15ffe0647670b**63b5729d38..**
> 82bef417b78b2b41959975fe7ccd05**5b2c369980 100644
> --- a/ash/system/tray_update.cc
> +++ b/ash/system/tray_update.cc
> @@ -66,6 +66,8 @@ bool TrayUpdate::**GetInitialVisibility() {
>  }
>
>  views::View* TrayUpdate::CreateDefaultView(**user::LoginStatus status) {
> +  if (!Shell::GetInstance()->tray_**delegate()->**SystemShouldUpgrade())
> +    return NULL;
>   default_.reset(new UpdateView);
>   return default_.get();
>  }
>
>
>