chrome/browser/ui/cocoa/image_button_cell_unittest.mm - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/image_button_cell_unittest.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 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

OLD	NEW
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/memory/scoped_nsobject.h"

6 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"	6 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

7 #import "chrome/browser/ui/cocoa/image_button_cell.h"	7 #import "chrome/browser/ui/cocoa/image_button_cell.h"

8 #include "grit/theme_resources.h"	8 #include "grit/theme_resources.h"

9 #include "grit/theme_resources_standard.h"

10	9

11 namespace {	10 namespace {

12	11

13 class ImageButtonCellTest : public CocoaTest {	12 class ImageButtonCellTest : public CocoaTest {

14 public:	13 public:

15 ImageButtonCellTest() {	14 ImageButtonCellTest() {

16 NSRect frame = NSMakeRect(0, 0, 50, 30);	15 NSRect frame = NSMakeRect(0, 0, 50, 30);

17 scoped_nsobject<NSButton>view([[NSButton alloc] initWithFrame:frame]);	16 scoped_nsobject<NSButton>view([[NSButton alloc] initWithFrame:frame]);

18 view_ = view.get();	17 view_ = view.get();

19 scoped_nsobject<ImageButtonCell> cell(	18 scoped_nsobject<ImageButtonCell> cell(

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 [[view_ cell] setEnabled:NO];	71 [[view_ cell] setEnabled:NO];

73 [view_ display];	72 [view_ display];

74	73

75 // Unset the disabled image and draw.	74 // Unset the disabled image and draw.

76 [[view_ cell] setImageID:0	75 [[view_ cell] setImageID:0

77 forButtonState:image_button_cell::kDisabledState];	76 forButtonState:image_button_cell::kDisabledState];

78 [view_ display];	77 [view_ display];

79 }	78 }

80	79

81 } // namespace	80 } // namespace

OLD	NEW