Make KeywordEditorCocoaController implement the proper protocols. Also remove

chrome/browser/cocoa/keyword_editor_cocoa_controller.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/table_model_observer.h"
+#import "base/cocoa_protocols_mac.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 
 class EditSearchEngineControllerDelegate;
 @class KeywordEditorCocoaController;
 class Profile;
 
 // Very thin bridge that simply pushes notifications from C++ to ObjC.
@@ skipping 33 matching lines @@
   // created in GetImageForRow().
   scoped_nsobject<NSPointerArray> iconImages_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordEditorModelObserver);
 };
 
 // This controller manages a window with a table view of search engines. It
 // acts as |tableView_|'s data source and delegate, feeding it data from the
 // KeywordEditorController's |table_model()|.
 
-@interface KeywordEditorCocoaController : NSWindowController {
+@interface KeywordEditorCocoaController : NSWindowController
+                                          <NSWindowDelegate,
+                                          NSTableViewDataSource,
+                                          NSTableViewDelegate> {
   IBOutlet NSTableView* tableView_;
   IBOutlet NSButton* addButton_;
   IBOutlet NSButton* removeButton_;
   IBOutlet NSButton* makeDefaultButton_;
 
   scoped_nsobject<NSTextFieldCell> groupCell_;
 
   Profile* profile_;  // weak
   scoped_ptr<KeywordEditorController> controller_;
   scoped_ptr<KeywordEditorModelObserver> observer_;
@@ skipping 24 matching lines @@
 
 // Returns a reference to the shared instance for the given profile,
 // or nil if there is none.
 + (KeywordEditorCocoaController*)sharedInstanceForProfile:(Profile*)profile;
 
 // Converts a row index in our table view (which has group header rows) into
 // one in the |controller_|'s model, which does not have them.
 - (int)indexInModelForRow:(NSUInteger)row;
 
 @end