From 4066f2d8f1e778029f1663546d39efb221ffc590 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Wed, 16 Sep 2009 00:09:06 +0000 Subject: Fix Snow Leopard SDK errors error: cannot convert 'scoped_nsobject' to 'objc_object*' in argument passing Review URL: http://codereview.chromium.org/204028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26304 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/autocomplete/autocomplete_edit_view_mac.mm | 2 +- chrome/browser/cocoa/autocomplete_text_field_unittest.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index 8865144..4575fecb 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -157,7 +157,7 @@ AutocompleteEditViewMac::AutocompleteEditViewMac( DCHECK(profile); DCHECK(command_updater); DCHECK(field); - [field_ setDelegate:edit_helper_]; + [field_ setDelegate:edit_helper_.get()]; // Needed so that editing doesn't lose the styling. [field_ setAllowsEditingTextAttributes:YES]; diff --git a/chrome/browser/cocoa/autocomplete_text_field_unittest.mm b/chrome/browser/cocoa/autocomplete_text_field_unittest.mm index 2ae0cdf..56ddc02 100644 --- a/chrome/browser/cocoa/autocomplete_text_field_unittest.mm +++ b/chrome/browser/cocoa/autocomplete_text_field_unittest.mm @@ -46,7 +46,7 @@ class AutocompleteTextFieldTest : public PlatformTest { window_delegate_.reset( [[AutocompleteTextFieldWindowTestDelegate alloc] init]); - [cocoa_helper_.window() setDelegate:window_delegate_]; + [cocoa_helper_.window() setDelegate:window_delegate_.get()]; } // The removeFromSuperview call is needed to prevent crashes in later tests. -- cgit v1.1