diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 19:56:12 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 19:56:12 +0000 |
commit | 6bea5abf7fb61153a722caef5f0575dcbca242a7 (patch) | |
tree | 39fdf8e05d360e5ae2971b06e77f9a22d120d284 /chrome/browser/cocoa | |
parent | c1164d88ff1ad51c8bda98937bd5b94944760649 (diff) | |
download | chromium_src-6bea5abf7fb61153a722caef5f0575dcbca242a7.zip chromium_src-6bea5abf7fb61153a722caef5f0575dcbca242a7.tar.gz chromium_src-6bea5abf7fb61153a722caef5f0575dcbca242a7.tar.bz2 |
Use delegates in AutocompleteEditViewMac and do other stuff to get it to build
with the 10.6 SDK.
Review URL: http://codereview.chromium.org/244009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r-- | chrome/browser/cocoa/autocomplete_text_field_editor_unittest.mm | 2 | ||||
-rw-r--r-- | chrome/browser/cocoa/autocomplete_text_field_unittest_helper.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/autocomplete_text_field_editor_unittest.mm b/chrome/browser/cocoa/autocomplete_text_field_editor_unittest.mm index e45fdd2..3df553d 100644 --- a/chrome/browser/cocoa/autocomplete_text_field_editor_unittest.mm +++ b/chrome/browser/cocoa/autocomplete_text_field_editor_unittest.mm @@ -52,7 +52,7 @@ class AutocompleteTextFieldEditorTest : public PlatformTest { // Arrange for |field_| to get the right field editor. window_delegate_.reset( [[AutocompleteTextFieldWindowTestDelegate alloc] init]); - [cocoa_helper_.window() setDelegate:window_delegate_]; + [cocoa_helper_.window() setDelegate:window_delegate_.get()]; // Get the field editor setup. cocoa_helper_.makeFirstResponder(field_); diff --git a/chrome/browser/cocoa/autocomplete_text_field_unittest_helper.h b/chrome/browser/cocoa/autocomplete_text_field_unittest_helper.h index 0993510..9aef620 100644 --- a/chrome/browser/cocoa/autocomplete_text_field_unittest_helper.h +++ b/chrome/browser/cocoa/autocomplete_text_field_unittest_helper.h @@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#import "base/cocoa_protocols_mac.h" #include "base/scoped_nsobject.h" #import "chrome/browser/cocoa/autocomplete_text_field.h" #include "testing/gmock/include/gmock/gmock.h" @@ -15,7 +16,8 @@ // Return the right field editor for AutocompleteTextField instance. -@interface AutocompleteTextFieldWindowTestDelegate : NSObject { +@interface AutocompleteTextFieldWindowTestDelegate : + NSObject<NSWindowDelegate> { scoped_nsobject<AutocompleteTextFieldEditor> editor_; } - (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject; |