summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/cocoa_test_helper.h
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 21:22:14 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 21:22:14 +0000
commitae5d37fe2c81312675fc1386bef3fc650b723f0c (patch)
treea67455465dbf208fc9249be7748046169c5d0ac8 /chrome/browser/cocoa/cocoa_test_helper.h
parent9c3cf2442bdb9c0391077190d16b8c1472f93204 (diff)
downloadchromium_src-ae5d37fe2c81312675fc1386bef3fc650b723f0c.zip
chromium_src-ae5d37fe2c81312675fc1386bef3fc650b723f0c.tar.gz
chromium_src-ae5d37fe2c81312675fc1386bef3fc650b723f0c.tar.bz2
Fixes up bookmark bubbles and the browser window so that they shut down correctly.
BookmarkBubbleController has been made an NSWindowController instead of the view controller that it used to be, and now loads its window from the nib instead of creating it on the fly. Also cleans up fullscreen mode so that the window referenced from browser_window_controller stays constant instead of having [self window] and window_ potentially pointing at two different windows. BookmarkBubble.xib has been modified so that it instantiates a window containing a bubble view instead of just instantiating a view. BUG=25054 TEST=Try going in and out of full screen mode. Try bringing up a bookmark bubble by clicking on the star. Try creating a pile of windows and then quitting, Review URL: http://codereview.chromium.org/333017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/cocoa_test_helper.h')
-rw-r--r--chrome/browser/cocoa/cocoa_test_helper.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/cocoa_test_helper.h b/chrome/browser/cocoa/cocoa_test_helper.h
index f980790..5b05505 100644
--- a/chrome/browser/cocoa/cocoa_test_helper.h
+++ b/chrome/browser/cocoa/cocoa_test_helper.h
@@ -105,15 +105,15 @@ class CocoaTest : public PlatformTest {
// displaying the view to make sure it won't crash, as well as removing it
// from a window. All tests that work with NSView subclasses and/or
// NSViewController subclasses should use it.
-#define TEST_VIEW(test_fixture, view_member_name) \
+#define TEST_VIEW(test_fixture, test_view) \
TEST_F(test_fixture, AddRemove##test_fixture) { \
- scoped_nsobject<NSView> view([view_member_name retain]); \
- EXPECT_EQ([test_window() contentView], [view_member_name superview]); \
- [view_member_name removeFromSuperview]; \
- EXPECT_FALSE([view_member_name superview]); \
+ scoped_nsobject<NSView> view([test_view retain]); \
+ EXPECT_EQ([test_window() contentView], [view superview]); \
+ [view removeFromSuperview]; \
+ EXPECT_FALSE([view superview]); \
} \
TEST_F(test_fixture, Display##test_fixture) { \
- [view_member_name display]; \
+ [test_view display]; \
}
// The classes below are deprecated and will be removed shortly. Do not write