Revert 133691 because it accidentally reverted revs 133686 and 133684.

ash/system/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/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 361 matching lines @@
         IDS_ASH_STATUS_TRAY_IP), ip_address));
     container->AddChildView(CreateTextLabels(bundle.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_ETHERNET), ethernet_address));
     container->AddChildView(CreateTextLabels(bundle.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_WIFI), wifi_address));
 
     return container;
   }
 
   void ToggleInfoBubble() {
-    if (info_bubble_) {
-      info_bubble_->GetWidget()->CloseNow();
-      info_bubble_ = NULL;
+    if (ResetInfoBubble())
       return;
-    }
+
     info_bubble_ = new NonActivatableSettingsBubble(
         info_icon_, CreateNetworkInfoView());
     views::BubbleDelegateView::CreateBubble(info_bubble_);
     info_bubble_->Show();
   }
 
+  // Returns whether an existing info-bubble was closed.
+  bool ResetInfoBubble() {
+    if (!info_bubble_)
+      return false;
+    info_bubble_->GetWidget()->Close();
+    info_bubble_ = NULL;
+    return true;
+  }
+
   // Overridden from views::View.
   virtual void Layout() OVERRIDE {
     views::View::Layout();
 
     // Align the network info view and icon.
     gfx::Rect header_bounds = header_->bounds();
     gfx::Size buttons_size = header_buttons_->size();
 
     header_buttons_->SetBounds(
         header_->width() - buttons_size.width(), 0,
         buttons_size.width(), header_->height());
     header_text_->SetBounds(0, 0,
         header_->width() - buttons_size.width(), header_->height());
   }
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
-    if (sender == info_icon_)
+    if (sender == info_icon_) {
       ToggleInfoBubble();
-    else if (sender == button_wifi_)
+      return;
+    }
+
+    // If the info bubble was visible, close it when some other item is clicked
+    // on.
+    ResetInfoBubble();
+    if (sender == button_wifi_)
       delegate->ToggleWifi();
     else if (sender == button_cellular_)
       delegate->ToggleCellular();
     else if (sender == settings_)
       delegate->ShowNetworkSettings();
     else if (sender == proxy_settings_)
       delegate->ChangeProxySettings();
     else if (sender == other_mobile_)
       delegate->ShowOtherCellular();
     else if (sender == other_wifi_)
       delegate->ShowOtherWifi();
     else
       NOTREACHED();
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     // If the info bubble was visible, close it when some other item is clicked
     // on.
-    if (info_bubble_) {
-      info_bubble_->GetWidget()->Close();
-      info_bubble_ = NULL;
-    }
+    ResetInfoBubble();
 
     if (sender == header_text_)
       Shell::GetInstance()->tray()->ShowDefaultView();
 
     if (login_ == user::LOGGED_IN_LOCKED)
       return;
 
     if (sender == mobile_account_) {
       delegate->ShowCellularTopupURL(topup_url_);
     } else if (sender == airplane_) {
@@ skipping 70 matching lines @@
   if (tray_.get())
     tray_->Update(info);
   if (default_.get())
     default_->Update();
   if (detailed_.get())
     detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash