diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-19 00:28:13 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-19 00:28:13 +0000 |
| commit | 3799b9d9233e0cae50b9f1b2649c050c76275825 (patch) | |
| tree | 512576bc45c46fa8c26a43887d794adefbe77079 /ash | |
| parent | eca2915e509c6939011a3a302bd5724b4a972e7e (diff) | |
| download | chromium_src-3799b9d9233e0cae50b9f1b2649c050c76275825.zip chromium_src-3799b9d9233e0cae50b9f1b2649c050c76275825.tar.gz chromium_src-3799b9d9233e0cae50b9f1b2649c050c76275825.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/network/tray_network.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc index 1a02308..95e588e 100644 --- a/ash/system/network/tray_network.cc +++ b/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); |