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

Side by Side Diff: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm

Issue 2752623003: [Mac] Fix for the security chip (Closed)
Patch Set: Rebased Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller. h" 5 #import "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller. h"
6 6
7 #include <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 8
9 #include "base/mac/foundation_util.h" 9 #include "base/mac/foundation_util.h"
10 #import "base/mac/scoped_objc_class_swizzler.h" 10 #import "base/mac/scoped_objc_class_swizzler.h"
11 #include "base/mac/sdk_forward_declarations.h" 11 #include "base/mac/sdk_forward_declarations.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/permissions/mock_permission_request.h" 15 #include "chrome/browser/permissions/mock_permission_request.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/browser/ui/cocoa/browser_window_controller.h" 18 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
19 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 19 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
20 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
20 #import "chrome/browser/ui/cocoa/page_info/split_block_button.h" 21 #import "chrome/browser/ui/cocoa/page_info/split_block_button.h"
21 #import "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.h" 22 #import "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.h"
22 #import "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" 23 #import "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
23 #include "chrome/browser/ui/cocoa/test/run_loop_testing.h" 24 #include "chrome/browser/ui/cocoa/test/run_loop_testing.h"
24 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
25 #include "components/strings/grit/components_strings.h" 26 #include "components/strings/grit/components_strings.h"
26 #include "testing/gmock/include/gmock/gmock.h" 27 #include "testing/gmock/include/gmock/gmock.h"
27 #import "testing/gtest_mac.h" 28 #import "testing/gtest_mac.h"
28 #include "ui/base/cocoa/cocoa_base_utils.h" 29 #include "ui/base/cocoa/cocoa_base_utils.h"
29 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 std::vector<std::unique_ptr<PermissionRequest>> owned_requests_; 165 std::vector<std::unique_ptr<PermissionRequest>> owned_requests_;
165 std::vector<bool> accept_states_; 166 std::vector<bool> accept_states_;
166 }; 167 };
167 168
168 TEST_F(PermissionBubbleControllerTest, ShowAndClose) { 169 TEST_F(PermissionBubbleControllerTest, ShowAndClose) {
169 EXPECT_FALSE([[controller_ window] isVisible]); 170 EXPECT_FALSE([[controller_ window] isVisible]);
170 [controller_ showWindow:nil]; 171 [controller_ showWindow:nil];
171 EXPECT_TRUE([[controller_ window] isVisible]); 172 EXPECT_TRUE([[controller_ window] isVisible]);
172 } 173 }
173 174
175 // Tests the page icon decoration's active state.
176 TEST_F(PermissionBubbleControllerTest, PageIconDecorationActiveState) {
177 base::mac::ScopedObjCClassSwizzler locationSwizzle(
178 [PermissionBubbleController class], [MockBubbleYesLocationBar class],
179 @selector(hasVisibleLocationBarForBrowser:));
180
181 NSWindow* window = browser()->window()->GetNativeWindow();
182 BrowserWindowController* controller =
183 [BrowserWindowController browserWindowControllerForWindow:window];
184 LocationBarDecoration* decoration =
185 [controller locationBarBridge]->GetPageInfoDecoration();
186
187 [controller_ showWindow:nil];
188 EXPECT_TRUE([[controller_ window] isVisible]);
189 EXPECT_TRUE(decoration->active());
190
191 [controller_ close];
192 EXPECT_FALSE(decoration->active());
193 }
194
174 TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) { 195 TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) {
175 [controller_ showWithDelegate:this 196 [controller_ showWithDelegate:this
176 forRequests:requests_ 197 forRequests:requests_
177 acceptStates:accept_states_]; 198 acceptStates:accept_states_];
178 199
179 EXPECT_TRUE(FindTextFieldWithString(kPermissionA)); 200 EXPECT_TRUE(FindTextFieldWithString(kPermissionA));
180 EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW)); 201 EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_ALLOW));
181 EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_DENY)); 202 EXPECT_TRUE(FindButtonWithTitle(IDS_PERMISSION_DENY));
182 EXPECT_FALSE(FindButtonWithTitle(IDS_OK)); 203 EXPECT_FALSE(FindButtonWithTitle(IDS_OK));
183 } 204 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 base::mac::ScopedObjCClassSwizzler locationSwizzle( 424 base::mac::ScopedObjCClassSwizzler locationSwizzle(
404 [PermissionBubbleController class], [MockBubbleNoLocationBar class], 425 [PermissionBubbleController class], [MockBubbleNoLocationBar class],
405 @selector(hasVisibleLocationBarForBrowser:)); 426 @selector(hasVisibleLocationBarForBrowser:));
406 withoutLocationBar = [controller_ getExpectedAnchorPoint]; 427 withoutLocationBar = [controller_ getExpectedAnchorPoint];
407 } 428 }
408 429
409 // The bubble should be in different places depending if the location bar is 430 // The bubble should be in different places depending if the location bar is
410 // available or not. 431 // available or not.
411 EXPECT_NSNE(withLocationBar, withoutLocationBar); 432 EXPECT_NSNE(withLocationBar, withoutLocationBar);
412 } 433 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698