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

Unified Diff: chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

Issue 167613002: Revert of [WebsiteSettings] Set view to null on manager to ensure no stale access. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/ui/website_settings/permission_bubble_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
index f1607dc09f2245f3931914324f1a097ab30003e7..c34f56851f54d1b0f8a3167de6945d9aa91625fb 100644
--- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
+++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
@@ -29,7 +29,7 @@
bool customization_mode);
virtual ~PermissionsBubbleDelegateView();
- void Close();
+ void ResetOwner();
void SizeToContents();
// BubbleDelegateView:
@@ -178,9 +178,8 @@
owner_->Closing();
}
-void PermissionsBubbleDelegateView::Close() {
+void PermissionsBubbleDelegateView::ResetOwner() {
owner_ = NULL;
- GetWidget()->Close();
}
bool PermissionsBubbleDelegateView::ShouldShowCloseButton() const {
@@ -229,10 +228,7 @@
delegate_(NULL),
bubble_delegate_(NULL) {}
-PermissionBubbleViewViews::~PermissionBubbleViewViews() {
- if (delegate_)
- delegate_->SetView(NULL);
-}
+PermissionBubbleViewViews::~PermissionBubbleViewViews() {}
void PermissionBubbleViewViews::SetDelegate(Delegate* delegate) {
delegate_ = delegate;
@@ -242,8 +238,10 @@
const std::vector<PermissionBubbleRequest*>& requests,
const std::vector<bool>& values,
bool customization_mode) {
- if (bubble_delegate_ != NULL)
- bubble_delegate_->Close();
+ if (bubble_delegate_ != NULL) {
+ bubble_delegate_->ResetOwner();
+ bubble_delegate_->StartFade(false);
+ }
PermissionsBubbleDelegateView* bubble_delegate =
new PermissionsBubbleDelegateView(anchor_view_, this,
@@ -257,8 +255,8 @@
void PermissionBubbleViewViews::Hide() {
if (bubble_delegate_) {
- bubble_delegate_->Close();
- bubble_delegate_ = NULL;
+ bubble_delegate_->ResetOwner();
+ bubble_delegate_->StartFade(false);
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/website_settings/permission_bubble_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698