Adjust wifi toggle message layout to avoid the wrapping of the message.

ash/system/chromeos/network/tray_network.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/chromeos/network/tray_network.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
@@ skipping 246 matching lines @@
 
   virtual void NetworkListChanged() OVERRIDE {
     Update();
   }
 
   virtual void NetworkServiceChanged(
       const chromeos::NetworkState* network) OVERRIDE {
   }
 
  private:
+  virtual void Layout() OVERRIDE {
+    // Center both views vertically.
+    views::View::Layout();
+    image_view_->SetY(
+        (height() - image_view_->GetPreferredSize().height()) / 2);
+    label_view_->SetY(
+        (height() - label_view_->GetPreferredSize().height()) / 2);
+  }
+
   void Update() {
     bool wifi_enabled = NetworkHandler::Get()->network_state_handler()->
         IsTechnologyEnabled(flimflam::kTypeWifi);
     const int image_id = wifi_enabled ?
         IDR_AURA_UBER_TRAY_WIFI_ENABLED : IDR_AURA_UBER_TRAY_WIFI_DISABLED;
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     image_view_->SetImage(bundle.GetImageNamed(image_id).ToImageSkia());
 
     const int string_id = wifi_enabled ?
         IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED :
         IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
     label_view_->SetText(bundle.GetLocalizedString(string_id));
+    label_view_->SizeToFit(kTrayPopupMinWidth -
+        kTrayPopupPaddingHorizontal * 2 - kTrayPopupPaddingBetweenItems -
+        kTrayPopupDetailsIconWidth);
   }
 
   views::ImageView* image_view_;
   views::Label* label_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView);
 };
 
 class NetworkMessageView : public views::View,
                            public views::LinkListener {
@@ skipping 249 matching lines @@
 
 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) {
   tray::NetworkMessages::MessageMap::const_iterator iter =
       messages()->messages().find(message_type);
   if (iter != messages()->messages().end() && iter->second.delegate)
     iter->second.delegate->NotificationLinkClicked(message_type, link_id);
 }
 
 }  // namespace internal
 }  // namespace ash