summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcampan@google.com <jcampan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 17:29:22 +0000
committerjcampan@google.com <jcampan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-30 17:29:22 +0000
commitab9279f87987825e5c40c12fef7fc22c4ceb0301 (patch)
tree8eb6a1602d555f2a0a1af9a30e37b2775f4c930c
parent175adac8a07694271f7a19d1b6204bb473b41b35 (diff)
downloadchromium_src-ab9279f87987825e5c40c12fef7fc22c4ceb0301.zip
chromium_src-ab9279f87987825e5c40c12fef7fc22c4ceb0301.tar.gz
chromium_src-ab9279f87987825e5c40c12fef7fc22c4ceb0301.tar.bz2
Make sure we remove info-bars on reload.
BUG=1296826 TEST=See bug git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/info_bar_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/info_bar_view.cc b/chrome/browser/views/info_bar_view.cc
index 399a120..92d74cb 100644
--- a/chrome/browser/views/info_bar_view.cc
+++ b/chrome/browser/views/info_bar_view.cc
@@ -141,7 +141,9 @@ void InfoBarView::DidNavigate(NavigationEntry* entry) {
entry->unique_id();
for (std::map<View*,int>::iterator i = expire_map_.begin();
i != expire_map_.end(); ++i) {
- if ((i->second) != active_id)
+ if ((pending_entry &&
+ pending_entry->GetTransitionType() == PageTransition::RELOAD) ||
+ i->second != active_id)
to_remove.push_back(i->first);
}