chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm - Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target.

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/website_settings/permission_bubble_controller_unittest.mm

Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile errors. Fix null-window error. Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 e3ceaffd28096c999eb56b7cc0b583188e6ca760..75d6c500ccda50444e62f029a8852cf0f000d5c3 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

@@ -25,6 +25,7 @@

#include "grit/components_strings.h"

#include "testing/gmock/include/gmock/gmock.h"

#import "testing/gtest_mac.h"

+#include "ui/base/cocoa/cocoa_base_utils.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/l10n/l10n_util_mac.h"

#import "ui/events/test/cocoa_test_event_utils.h"

@@ -363,7 +364,7 @@ TEST_F(PermissionBubbleControllerTest, AnchorPositionWithLocationBar) {

[BrowserWindowController browserWindowControllerForWindow:window];

LocationBarViewMac* location_bar_bridge = [controller locationBarBridge];

NSPoint expected = location_bar_bridge->GetPageInfoBubblePoint();

- expected = [window convertBaseToScreen:expected];

+ expected = ui::ConvertPointFromWindowToScreen(window, expected);

EXPECT_NSEQ(expected, anchor);

}

@@ -379,7 +380,7 @@ TEST_F(PermissionBubbleControllerTest, AnchorPositionWithoutLocationBar) {

NSWindow* window = browser()->window()->GetNativeWindow();

NSRect frame = [window frame];

NSPoint expected = NSMakePoint(frame.size.width / 2, frame.size.height);

- expected = [window convertBaseToScreen:expected];

+ expected = ui::ConvertPointFromWindowToScreen(window, expected);

EXPECT_NSEQ(expected, anchor);

}