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

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

Issue 2403763003: [Mac] Address buggy permission bubble behaviour on dismissal via ESC. (Closed)
Patch Set: Use Closing Created 4 years, 2 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 | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc b/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
index 94ea1b805c397aaad9fd417bae0f1f0bb73674c4..354f63a1003dc03aadb1e85b8b89f79749349c74 100644
--- a/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
+++ b/chrome/browser/ui/views/website_settings/permission_prompt_impl.cc
@@ -393,10 +393,7 @@ void PermissionsBubbleDialogDelegateView::UpdateAnchor(
PermissionPromptImpl::PermissionPromptImpl(Browser* browser)
: browser_(browser),
delegate_(nullptr),
- bubble_delegate_(nullptr) {
- DCHECK(browser);
- DCHECK(browser->window());
-}
+ bubble_delegate_(nullptr) {}
PermissionPromptImpl::~PermissionPromptImpl() {
}
@@ -407,6 +404,9 @@ void PermissionPromptImpl::SetDelegate(Delegate* delegate) {
void PermissionPromptImpl::Show(const std::vector<PermissionRequest*>& requests,
const std::vector<bool>& values) {
+ DCHECK(browser_);
+ DCHECK(browser_->window());
+
if (bubble_delegate_)
bubble_delegate_->CloseBubble();
@@ -441,6 +441,9 @@ bool PermissionPromptImpl::IsVisible() {
}
void PermissionPromptImpl::UpdateAnchorPosition() {
+ DCHECK(browser_);
+ DCHECK(browser_->window());
+
if (IsVisible()) {
bubble_delegate_->set_parent_window(
platform_util::GetViewForWindow(browser_->window()->GetNativeWindow()));
« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698