Use delegate protocols present in the 10.6 SDK. For previous SDKs, provide

empty protocol definitions for compatibility.

BUG=20925
TEST=build
Review URL: http://codereview.chromium.org/209004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26477 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h
index 53fe1ed..df7891b 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.h
@@ -17,8 +17,8 @@
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditController;
-@class AutocompleteEditHelper;
 class AutocompleteEditModel;
+@class AutocompleteFieldDelegate;
 class AutocompletePopupViewMac;
 @class AutocompleteTextField;
 class BubblePositioner;
@@ -88,7 +88,7 @@ class AutocompleteEditViewMac : public AutocompleteEditView {
   virtual bool OnAfterPossibleChange();
   virtual gfx::NativeView GetNativeView() const;
 
-  // Helper functions for use from AutocompleteEditHelper Objective-C
+  // Helper functions for use from AutocompleteFieldDelegate Objective-C
   // class.
 
   // Returns true if |popup_view_| is open.
@@ -176,7 +176,7 @@ class AutocompleteEditViewMac : public AutocompleteEditView {
   AutocompleteTextField* field_;  // owned by tab controller
 
   // Objective-C object to bridge field_ delegate calls to C++.
-  scoped_nsobject<AutocompleteEditHelper> edit_helper_;
+  scoped_nsobject<AutocompleteFieldDelegate> edit_helper_;
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 4575fecb..ff81db3 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -8,6 +8,7 @@
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/clipboard.h"
+#import "base/cocoa_protocols_mac.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ -125,7 +126,7 @@ NSRange ComponentToNSRange(const url_parse::Component& component) {
 // It intercepts various control delegate methods and vectors them to
 // the edit view.
 
-@interface AutocompleteFieldDelegate : NSObject {
+@interface AutocompleteFieldDelegate : NSObject<NSTextFieldDelegate> {
  @private
   AutocompleteEditViewMac* edit_view_;  // weak, owns us.
 }