chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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/bookmarks/bookmark_bar_folder_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/bookmarks/bookmark_bar_folder_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

index e516532a3c8259b58765357eac90c620b2cb0da9..fa15a1300cd736a0243cafd6bc9e20035726a68a 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

@@ -2,6 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include <cmath>

#include "base/mac/scoped_nsobject.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

@@ -20,8 +22,7 @@

#import "testing/gtest_mac.h"

#include "testing/platform_test.h"

#include "ui/base/cocoa/animation_utils.h"

-#include <cmath>

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

using base::ASCIIToUTF16;

using bookmarks::BookmarkModel;

@@ -269,8 +270,8 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {

NSPoint buttonOriginInWindow =

[parentButton convertRect:[parentButton bounds]

toView:nil].origin;

- NSPoint buttonOriginInScreen =

- [[parentButton window] convertBaseToScreen:buttonOriginInWindow];

+ NSPoint buttonOriginInScreen = ui::ConvertPointFromWindowToScreen(

+ [parentButton window], buttonOriginInWindow);

// Within margin

EXPECT_LE(std::abs(pt.x - buttonOriginInScreen.x),

bookmarks::kBookmarkMenuOverlap + 1);