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

ash/system/tray/tray_item_more.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/tray_item_more.h"
 
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ui_resources.h"
@@ skipping 56 matching lines @@
 
   // Make sure the chevron always has the full size.
   gfx::Size size = more_->GetPreferredSize();
   gfx::Rect bounds(size);
   bounds.set_x(width() - size.width() - kTrayPopupPaddingBetweenItems);
   bounds.set_y((height() - size.height()) / 2);
   more_->SetBoundsRect(bounds);
 
   // 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);
   }
 }
 
 bool TrayItemMore::OnKeyPressed(const views::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
     owner_->PopupDetailedView(0, true);
     return true;
   }
   return false;
 }
 
 bool TrayItemMore::OnMousePressed(const views::MouseEvent& event) {
   owner_->PopupDetailedView(0, true);
   return true;
 }
 
 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = accessible_name_;
 }
 
 }  // namespace internal
 }  // namespace ash