Crash fix for system tray. We try to enable proxy settings entry even while there are created.

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 224 matching lines @@
         IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER,
         IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER);
     footer()->AddButton(info_icon_);
   }
 
   void UpdateHeaderButtons() {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     button_wifi_->SetToggled(!delegate->GetWifiEnabled());
     button_mobile_->SetToggled(!delegate->GetMobileEnabled());
     button_mobile_->SetVisible(delegate->GetMobileAvailable());
-    proxy_settings_->SetEnabled(delegate->IsNetworkConnected());
+    if (proxy_settings_)
+      proxy_settings_->SetEnabled(delegate->IsNetworkConnected());
   }
 
   void AppendNetworkEntries() {
     CreateScrollableList();
 
     HoverHighlightView* container = new HoverHighlightView(this);
     container->set_fixed_height(kTrayPopupItemHeight);
     container->AddLabel(ui::ResourceBundle::GetSharedInstance().
         GetLocalizedString(IDS_ASH_STATUS_TRAY_MOBILE_VIEW_ACCOUNT),
         gfx::Font::NORMAL);
@@ skipping 72 matching lines @@
 
     other_wifi_ = new TrayPopupTextButton(this,
         rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_OTHER_WIFI));
     bottom_row->AddTextButton(other_wifi_);
 
     other_mobile_ = new TrayPopupTextButton(this,
         rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_OTHER_MOBILE));
     bottom_row->AddTextButton(other_mobile_);
 
     CreateSettingsEntry();
+    DCHECK(settings_ || proxy_settings_);
     bottom_row->AddTextButton(settings_ ? settings_ : proxy_settings_);
 
     AddChildView(bottom_row);
   }
 
   void UpdateNetworkExtra() {
     if (login_ == user::LOGGED_IN_LOCKED)
       return;
 
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
@@ skipping 215 matching lines @@
   if (tray_)
     tray_->Update(info);
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash