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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_view_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/memory/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
9 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 9 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "testing/platform_test.h" 11 #include "testing/platform_test.h"
12 12
13 namespace { 13 namespace {
14 14
15 const float kTabWidth = 50; 15 const float kTabWidth = 50;
16 const float kTabHeight = 30; 16 const float kTabHeight = 30;
17 17
18 class TabViewTest : public CocoaTest { 18 class TabViewTest : public CocoaTest {
19 public: 19 public:
20 TabViewTest() { 20 TabViewTest() {
21 NSRect frame = NSMakeRect(0, 0, kTabWidth, kTabHeight); 21 NSRect frame = NSMakeRect(0, 0, kTabWidth, kTabHeight);
22 scoped_nsobject<TabView> view([[TabView alloc] initWithFrame:frame]); 22 base::scoped_nsobject<TabView> view([[TabView alloc] initWithFrame:frame]);
23 view_ = view.get(); 23 view_ = view.get();
24 [[test_window() contentView] addSubview:view_]; 24 [[test_window() contentView] addSubview:view_];
25 } 25 }
26 26
27 TabView* view_; 27 TabView* view_;
28 }; 28 };
29 29
30 TEST_VIEW(TabViewTest, view_) 30 TEST_VIEW(TabViewTest, view_)
31 31
32 // Test drawing, mostly to ensure nothing leaks or crashes. 32 // Test drawing, mostly to ensure nothing leaks or crashes.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 EXPECT_TRUE([view_ hitTest:bottomLeftCorner]); 66 EXPECT_TRUE([view_ hitTest:bottomLeftCorner]);
67 67
68 NSPoint topLeftCorner = NSMakePoint(0, kTabHeight); 68 NSPoint topLeftCorner = NSMakePoint(0, kTabHeight);
69 EXPECT_FALSE([view_ hitTest:topLeftCorner]); 69 EXPECT_FALSE([view_ hitTest:topLeftCorner]);
70 70
71 NSPoint middle = NSMakePoint(kTabWidth / 2, kTabHeight / 2); 71 NSPoint middle = NSMakePoint(kTabWidth / 2, kTabHeight / 2);
72 EXPECT_TRUE([view_ hitTest:middle]); 72 EXPECT_TRUE([view_ hitTest:middle]);
73 } 73 }
74 74
75 } // namespace 75 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698