chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm - Issue 1456213002: Revert of [Extensions] Don't count bubble dismissal from focus loss as acknowledgment

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

Issue 1456213002: Revert of [Extensions] Don't count bubble dismissal from focus loss as acknowledgment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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/extensions/extension_message_bubble_bridge.mm ('k') | chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

diff --git a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

index ccba1d8018ac494a4c143cd47ef9162b907766af..5e01460438093685a2acff085841b3047dff5212 100644

--- a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

+++ b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

@@ -106,7 +106,7 @@

- (void)windowWillClose:(NSNotification*)notification {

if (!acknowledged_) {

delegate_->OnBubbleClosed(

- ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION);

+ ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);

acknowledged_ = YES;

}

[super windowWillClose:notification];

@@ -327,7 +327,7 @@

if (learnMoreButton_ && sender == learnMoreButton_) {

action = ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE;

} else if (dismissButton_ && sender == dismissButton_) {

- action = ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION;

+ action = ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS;

} else {

DCHECK_EQ(sender, actionButton_);

action = ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE;