diff options
| author | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 19:16:50 +0000 |
|---|---|---|
| committer | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 19:16:50 +0000 |
| commit | 7a147fb74d7657f42378947a31d24d197d2345db (patch) | |
| tree | 35d57ec0757ef53986a636b958448edc7310431f /chrome/browser/cocoa | |
| parent | 53b8aff721d0e8fa9fb4fb9b45d1d96aa3d0c241 (diff) | |
| download | chromium_src-7a147fb74d7657f42378947a31d24d197d2345db.zip chromium_src-7a147fb74d7657f42378947a31d24d197d2345db.tar.gz chromium_src-7a147fb74d7657f42378947a31d24d197d2345db.tar.bz2 | |
Unsubscribe SidebarController from NSSplitView updates in dealloc (no zombies).
Enable ViewIDTest.Fullscreen back.
BUG=55643
TEST=browser_tests --gtest_filter=ViewIdTest.Fullscreen
Review URL: http://codereview.chromium.org/3424006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/sidebar_controller.mm | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/view_id_util_browsertest.mm | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/sidebar_controller.mm b/chrome/browser/cocoa/sidebar_controller.mm index 403ec10..9b879d6 100644 --- a/chrome/browser/cocoa/sidebar_controller.mm +++ b/chrome/browser/cocoa/sidebar_controller.mm @@ -47,6 +47,11 @@ const int kMinWebWidth = 50; return self; } +- (void)dealloc { + [sidebarView_ setDelegate:nil]; + [super dealloc]; +} + - (void)updateSidebarForTabContents:(TabContents*)contents { // Get the active sidebar content. if (SidebarManager::GetInstance() == NULL) // Happens in tests. diff --git a/chrome/browser/cocoa/view_id_util_browsertest.mm b/chrome/browser/cocoa/view_id_util_browsertest.mm index 52bb3e1..e18ae03 100644 --- a/chrome/browser/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/cocoa/view_id_util_browsertest.mm @@ -91,9 +91,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { ASSERT_NO_FATAL_FAILURE(DoTest()); } -// Fullscreen test is crashy -// http://crbug.com/55643 -IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) { +IN_PROC_BROWSER_TEST_F(ViewIDTest, Fullscreen) { browser()->window()->SetFullscreen(true); ASSERT_NO_FATAL_FAILURE(DoTest()); } |