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

BUG=none
TEST=make sure status tray pops up while we are signed in without crashing
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10383255

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137995 0039d316-1c4b-4281-b951-d872f2087c98

ash/system/network/tray_network.cc

@@ -242,7 +242,8 @@ class NetworkDetailedView : public TrayDetailsView,
     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() {
@@ -335,6 +336,7 @@ class NetworkDetailedView : public TrayDetailsView,
     bottom_row->AddTextButton(other_mobile_);
 
     CreateSettingsEntry();
+    DCHECK(settings_ || proxy_settings_);
     bottom_row->AddTextButton(settings_ ? settings_ : proxy_settings_);
 
     AddChildView(bottom_row);