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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

Issue 1292353006: Mac Changes for BubbleManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mcdb-mac-3.gitbr
Patch Set: Created 5 years, 4 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
« chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm ('K') | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | chrome/browser/ui/website_settings/mock_permission_bubble_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
index 899fce37506f3e66ce32984ce48003f0b6efef54..6fd9d2276dc682dddc8e50662b9731878ae07397 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
@@ -22,6 +22,8 @@
#include "ui/base/l10n/l10n_util_mac.h"
#import "ui/events/test/cocoa_test_event_utils.h"
+// TODO(hcarmona): compile this
+
@class ConstrainedWindowButton;
@interface PermissionBubbleController (ExposedForTesting)
@@ -57,9 +59,9 @@ class PermissionBubbleControllerTest : public CocoaProfileTest,
CocoaProfileTest::SetUp();
bridge_.reset(new PermissionBubbleCocoa(browser()));
AddRequest(kPermissionA);
- controller_ = [[PermissionBubbleController alloc]
- initWithParentWindow:test_window()
- bridge:bridge_.get()];
+ controller_ =
+ [[PermissionBubbleController alloc] initWithBrowser:browser()
+ bridge:bridge_.get()];
}
void TearDown() override {
@@ -146,10 +148,9 @@ TEST_F(PermissionBubbleControllerTest, ShowAndClose) {
}
TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) {
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
@@ -165,10 +166,9 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissions) {
accept_states_.push_back(true); // B
accept_states_.push_back(true); // C
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
EXPECT_TRUE(FindTextFieldWithString(kPermissionB));
@@ -185,10 +185,9 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsAllow) {
accept_states_.push_back(true); // A
accept_states_.push_back(true); // B
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
// Test that all menus have 'Allow' visible.
EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_ALLOW));
@@ -205,10 +204,9 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsBlock) {
accept_states_.push_back(false); // A
accept_states_.push_back(false); // B
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
// Test that all menus have 'Block' visible.
EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY));
@@ -227,10 +225,9 @@ TEST_F(PermissionBubbleControllerTest, ShowMultiplePermissionsMixed) {
accept_states_.push_back(false); // B
accept_states_.push_back(true); // C
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
// Test that both 'allow' and 'deny' are visible.
EXPECT_TRUE(FindMenuButtonWithTitle(IDS_PERMISSION_DENY));
@@ -247,30 +244,27 @@ TEST_F(PermissionBubbleControllerTest, OK) {
accept_states_.push_back(true); // A
accept_states_.push_back(true); // B
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_CALL(*this, Accept()).Times(1);
[FindButtonWithTitle(IDS_OK) performClick:nil];
}
TEST_F(PermissionBubbleControllerTest, Allow) {
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_CALL(*this, Accept()).Times(1);
[FindButtonWithTitle(IDS_PERMISSION_ALLOW) performClick:nil];
}
TEST_F(PermissionBubbleControllerTest, Deny) {
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_CALL(*this, Deny()).Times(1);
[FindButtonWithTitle(IDS_PERMISSION_DENY) performClick:nil];
@@ -282,10 +276,9 @@ TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) {
accept_states_.push_back(true); // A
accept_states_.push_back(false); // B
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_CALL(*this, ToggleAccept(0, false)).Times(1);
EXPECT_CALL(*this, ToggleAccept(1, true)).Times(1);
@@ -296,10 +289,9 @@ TEST_F(PermissionBubbleControllerTest, ChangePermissionSelection) {
}
TEST_F(PermissionBubbleControllerTest, EscapeCloses) {
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_TRUE([[controller_ window] isVisible]);
[[controller_ window]
@@ -309,10 +301,9 @@ TEST_F(PermissionBubbleControllerTest, EscapeCloses) {
}
TEST_F(PermissionBubbleControllerTest, EnterFullscreen) {
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_TRUE([[controller_ window] isVisible]);
@@ -325,10 +316,9 @@ TEST_F(PermissionBubbleControllerTest, EnterFullscreen) {
}
TEST_F(PermissionBubbleControllerTest, ExitFullscreen) {
- [controller_ showAtAnchor:NSZeroPoint
- withDelegate:this
- forRequests:requests_
- acceptStates:accept_states_];
+ [controller_ showWithDelegate:this
+ forRequests:requests_
+ acceptStates:accept_states_];
EXPECT_TRUE([[controller_ window] isVisible]);
« chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm ('K') | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | chrome/browser/ui/website_settings/mock_permission_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698