Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 3169030: Change the conditions on which the popup blocked animation is shown to be more reliable. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix compile Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index b22c2f8c9c62a07ae0f1fdc470b3823fed0c8a6f..70aab9efe66c48dd1872589b63196614766b52ed 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1022,8 +1022,6 @@ void TabContents::PopupNotificationVisibilityChanged(bool visible) {
content_settings_delegate_->SetPopupsBlocked(visible);
if (!dont_notify_render_view_)
render_view_host()->AllowScriptToClose(!visible);
- if (visible)
- PopupBlockedAnimation::Show(this);
}
gfx::NativeView TabContents::GetContentNativeView() const {
@@ -1526,6 +1524,8 @@ void TabContents::AddPopup(TabContents* new_contents,
blocked_popups_->AddTabContents(new_contents, initial_pos);
content_settings_delegate_->OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS,
std::string());
+ if (!is_being_destroyed())
+ PopupBlockedAnimation::Show(this);
}
}

Powered by Google App Engine
This is Rietveld 408576698