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

Side by Side Diff: ui/gfx/mac/coordinate_conversion_unittest.mm

Issue 1380083005: Mac: Use [NSArray firstObject] for [NSScreen screens] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « ui/gfx/mac/coordinate_conversion.mm ('k') | ui/gfx/screen_mac.mm » ('j') | 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 "ui/gfx/mac/coordinate_conversion.h" 5 #import "ui/gfx/mac/coordinate_conversion.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #import "base/mac/scoped_objc_class_swizzler.h" 9 #import "base/mac/scoped_objc_class_swizzler.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 30 matching lines...) Expand all
41 41
42 private: 42 private:
43 scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_frame_; 43 scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_frame_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(MacCoordinateConversionTest); 45 DISALLOW_COPY_AND_ASSIGN(MacCoordinateConversionTest);
46 }; 46 };
47 47
48 void MacCoordinateConversionTest::SetUp() { 48 void MacCoordinateConversionTest::SetUp() {
49 // Before swizzling, do a sanity check that the primary screen's origin is 49 // Before swizzling, do a sanity check that the primary screen's origin is
50 // (0, 0). This should always be true. 50 // (0, 0). This should always be true.
51 NSRect primary_screen_frame = [[[NSScreen screens] objectAtIndex:0] frame]; 51 NSRect primary_screen_frame = [[[NSScreen screens] firstObject] frame];
52 EXPECT_EQ(0, primary_screen_frame.origin.x); 52 EXPECT_EQ(0, primary_screen_frame.origin.x);
53 EXPECT_EQ(0, primary_screen_frame.origin.y); 53 EXPECT_EQ(0, primary_screen_frame.origin.y);
54 54
55 swizzle_frame_.reset(new base::mac::ScopedObjCClassSwizzler( 55 swizzle_frame_.reset(new base::mac::ScopedObjCClassSwizzler(
56 [NSScreen class], 56 [NSScreen class],
57 [MacCoordinateConversionTestScreenDonor class], 57 [MacCoordinateConversionTestScreenDonor class],
58 @selector(frame))); 58 @selector(frame)));
59 59
60 primary_screen_frame = [[[NSScreen screens] objectAtIndex:0] frame]; 60 primary_screen_frame = [[[NSScreen screens] firstObject] frame];
61 EXPECT_EQ(kTestWidth, primary_screen_frame.size.width); 61 EXPECT_EQ(kTestWidth, primary_screen_frame.size.width);
62 EXPECT_EQ(kTestHeight, primary_screen_frame.size.height); 62 EXPECT_EQ(kTestHeight, primary_screen_frame.size.height);
63 } 63 }
64 64
65 void MacCoordinateConversionTest::TearDown() { 65 void MacCoordinateConversionTest::TearDown() {
66 swizzle_frame_.reset(); 66 swizzle_frame_.reset();
67 } 67 }
68 68
69 } // namespace 69 } // namespace
70 70
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 EXPECT_EQ(gfx_point, ScreenPointFromNSPoint(ns_point)); 128 EXPECT_EQ(gfx_point, ScreenPointFromNSPoint(ns_point));
129 129
130 // Point in a screen below and to the left primary screen. 130 // Point in a screen below and to the left primary screen.
131 gfx_point = Point(-40, 220); 131 gfx_point = Point(-40, 220);
132 ns_point = ScreenPointToNSPoint(gfx_point); 132 ns_point = ScreenPointToNSPoint(gfx_point);
133 EXPECT_NSEQ(NSMakePoint(-40, -20), ns_point); 133 EXPECT_NSEQ(NSMakePoint(-40, -20), ns_point);
134 EXPECT_EQ(gfx_point, ScreenPointFromNSPoint(ns_point)); 134 EXPECT_EQ(gfx_point, ScreenPointFromNSPoint(ns_point));
135 } 135 }
136 136
137 } // namespace gfx 137 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/mac/coordinate_conversion.mm ('k') | ui/gfx/screen_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698