chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.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_unittest.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/toolbar_actions_bar_bubble_mac.mm ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h » ('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_unittest.mm

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

index 4f9a44394119fcd4f49423d0ea1a8b6f0fc7ebe3..6c266f4cda1f1599eb5c8274eb5960d3425588e7 100644

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

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

@@ -117,14 +117,11 @@

case ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE:

button = [bubble actionButton];

break;

- case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION:

+ case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS:

button = [bubble dismissButton];

break;

case ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE:

button = [bubble learnMoreButton];

- break;

- case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION:

- NOTREACHED(); // Deactivation is tested below.

break;

}

ASSERT_TRUE(button);

@@ -147,7 +144,7 @@

TEST_F(ToolbarActionsBarBubbleMacTest, CloseActionAndDismiss) {

// Test all the possible actions.

TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);

- TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);

+ TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);

TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);

{

@@ -163,7 +160,7 @@

[bubble close];

chrome::testing::NSRunLoopRunAllPending();

ASSERT_TRUE(delegate.close_action());

- EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION,

+ EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS,

*delegate.close_action());

EXPECT_TRUE([windowObserver windowIsClosing]);

}