diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 16:46:25 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 16:46:25 +0000 |
| commit | e602bbbd2e748edd1db8a221f12f4d923ca7dffe (patch) | |
| tree | 86398e881716d4a15d5614b8df43e2ac71cbb6a8 | |
| parent | f88147816cef3f9e8e3a807098d79b8f2c242101 (diff) | |
| download | chromium_src-e602bbbd2e748edd1db8a221f12f4d923ca7dffe.zip chromium_src-e602bbbd2e748edd1db8a221f12f4d923ca7dffe.tar.gz chromium_src-e602bbbd2e748edd1db8a221f12f4d923ca7dffe.tar.bz2 | |
Fix the crash issue caused by toggling wifi button.
BUG=149179
Review URL: https://codereview.chromium.org/10910295
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157128 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/system/network/tray_network.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc index 75c5d31..8e750d7 100644 --- a/ash/system/network/tray_network.cc +++ b/ash/system/network/tray_network.cc @@ -359,6 +359,9 @@ class NetworkListDetailedView : public NetworkDetailedView, bool needs_relayout = false; views::View* highlighted_view = NULL; + if (service_path_map_.empty()) + scroll_content()->RemoveAllChildViews(true); + for (size_t i = 0; i < network_list_.size(); ++i) { std::map<std::string, HoverHighlightView*>::const_iterator it = service_path_map_.find(network_list_[i].service_path); @@ -426,6 +429,8 @@ class NetworkListDetailedView : public NetworkDetailedView, } void RefreshNetworkScrollWithEmptyNetworkList() { + service_path_map_.clear(); + network_map_.clear(); scroll_content()->RemoveAllChildViews(true); HoverHighlightView* container = new HoverHighlightView(this); container->set_fixed_height(kTrayPopupItemHeight); @@ -444,7 +449,6 @@ class NetworkListDetailedView : public NetworkDetailedView, container->AddLabel(ui::ResourceBundle::GetSharedInstance(). GetLocalizedString(IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED), gfx::Font::NORMAL); - AddChildView(container); } scroll_content()->AddChildViewAt(container, 0); |