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

Side by Side Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_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, 6 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 #include "base/memory/scoped_nsobject.h" 5 #include "base/mac/scoped_nsobject.h"
6 #include "chrome/app/chrome_command_ids.h" 6 #include "chrome/app/chrome_command_ids.h"
7 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 7 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
8 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h" 8 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "testing/platform_test.h" 10 #include "testing/platform_test.h"
11 11
12 @interface TestWrenchMenuButton : NSButton 12 @interface TestWrenchMenuButton : NSButton
13 @end 13 @end
14 @implementation TestWrenchMenuButton 14 @implementation TestWrenchMenuButton
15 + (Class)cellClass { 15 + (Class)cellClass {
16 return [WrenchMenuButtonCell class]; 16 return [WrenchMenuButtonCell class];
17 } 17 }
18 @end 18 @end
19 19
20 namespace { 20 namespace {
21 21
22 class WrenchMenuButtonCellTest : public CocoaTest { 22 class WrenchMenuButtonCellTest : public CocoaTest {
23 public: 23 public:
24 virtual void SetUp() { 24 virtual void SetUp() {
25 CocoaTest::SetUp(); 25 CocoaTest::SetUp();
26 26
27 NSRect frame = NSMakeRect(10, 10, 50, 19); 27 NSRect frame = NSMakeRect(10, 10, 50, 19);
28 button_.reset([[TestWrenchMenuButton alloc] initWithFrame:frame]); 28 button_.reset([[TestWrenchMenuButton alloc] initWithFrame:frame]);
29 [button_ setBezelStyle:NSSmallSquareBezelStyle]; 29 [button_ setBezelStyle:NSSmallSquareBezelStyle];
30 [[button_ cell] setControlSize:NSSmallControlSize]; 30 [[button_ cell] setControlSize:NSSmallControlSize];
31 [button_ setTitle:@"Allays"]; 31 [button_ setTitle:@"Allays"];
32 [button_ setButtonType:NSMomentaryPushInButton]; 32 [button_ setButtonType:NSMomentaryPushInButton];
33 } 33 }
34 34
35 scoped_nsobject<NSButton> button_; 35 base::scoped_nsobject<NSButton> button_;
36 }; 36 };
37 37
38 TEST_F(WrenchMenuButtonCellTest, Draw) { 38 TEST_F(WrenchMenuButtonCellTest, Draw) {
39 ASSERT_TRUE(button_.get()); 39 ASSERT_TRUE(button_.get());
40 [[test_window() contentView] addSubview:button_.get()]; 40 [[test_window() contentView] addSubview:button_.get()];
41 [button_ setNeedsDisplay:YES]; 41 [button_ setNeedsDisplay:YES];
42 } 42 }
43 43
44 TEST_F(WrenchMenuButtonCellTest, DrawHighlight) { 44 TEST_F(WrenchMenuButtonCellTest, DrawHighlight) {
45 ASSERT_TRUE(button_.get()); 45 ASSERT_TRUE(button_.get());
46 [[test_window() contentView] addSubview:button_.get()]; 46 [[test_window() contentView] addSubview:button_.get()];
47 [button_ highlight:YES]; 47 [button_ highlight:YES];
48 [button_ setNeedsDisplay:YES]; 48 [button_ setNeedsDisplay:YES];
49 } 49 }
50 50
51 } // namespace 51 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698