summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 16:43:46 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 16:43:46 +0000
commit9eef48703aee39172ae6e45425e2bfbdfd759aa7 (patch)
treee5d8edc770fbfc1cda2da3ed4a51ab5ac1c67155 /ash
parentac74c51149d9f1b172f3bf76545b4a3ac72ca9ba (diff)
downloadchromium_src-9eef48703aee39172ae6e45425e2bfbdfd759aa7.zip
chromium_src-9eef48703aee39172ae6e45425e2bfbdfd759aa7.tar.gz
chromium_src-9eef48703aee39172ae6e45425e2bfbdfd759aa7.tar.bz2
clear maps for uber tray detaild views in case that they are recreated.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9961011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/bluetooth/tray_bluetooth.cc1
-rw-r--r--ash/system/network/tray_network.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index e4146ac..4d5bc35 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -94,6 +94,7 @@ class BluetoothDetailedView : public views::View,
views::View* devices = new views::View;
devices->SetLayoutManager(new views::BoxLayout(
views::BoxLayout::kVertical, 0, 0, 1));
+ device_map_.clear();
for (size_t i = 0; i < list.size(); i++) {
HoverHighlightView* container = new HoverHighlightView(this);
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc
index 3138117..712af7e 100644
--- a/ash/system/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -231,6 +231,7 @@ class NetworkDetailedView : public views::View,
views::View* networks = new views::View;
networks->SetLayoutManager(new views::BoxLayout(
views::BoxLayout::kVertical, 0, 0, 1));
+ network_map_.clear();
for (size_t i = 0; i < list.size(); i++) {
HoverHighlightView* container = new HoverHighlightView(this);
container->AddIconAndLabel(list[i].image,