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

Unified Diff: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.mm

Issue 2829023002: Fix cancelling permission requests on Android when the PermissionRequestManager is enabled (Closed)
Patch Set: rebase Created 3 years, 7 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/ui/cocoa/permission_bubble/permission_bubble_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.mm b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.mm
index 6f644ade432c72a9660d1a356d4eed10cb55c4fa..37f000b9965a6aa45648e2c0e8eefcfe52aff349 100644
--- a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.mm
@@ -20,12 +20,8 @@ PermissionBubbleCocoa::~PermissionBubbleCocoa() {
void PermissionBubbleCocoa::Show() {
DCHECK(browser_);
- if (!bubbleController_) {
- bubbleController_ =
- [[PermissionBubbleController alloc] initWithBrowser:browser_
- bridge:this];
- }
-
+ bubbleController_ =
+ [[PermissionBubbleController alloc] initWithBrowser:browser_ bridge:this];
[bubbleController_ showWithDelegate:delegate_];
}
@@ -39,8 +35,11 @@ void PermissionBubbleCocoa::SetDelegate(Delegate* delegate) {
delegate_ = delegate;
}
-bool PermissionBubbleCocoa::CanAcceptRequestUpdate() {
- return ![[[bubbleController_ window] contentView] cr_isMouseInView];
+bool PermissionBubbleCocoa::MaybeCancelRequest() {
+ if ([[[bubbleController_ window] contentView] cr_isMouseInView])
+ return false;
+ Hide();
+ return true;
}
bool PermissionBubbleCocoa::HidesAutomatically() {

Powered by Google App Engine
This is Rietveld 408576698