Fix some errors found when building on the 10.6 SDK.

BUG=none
TEST=Using 10.6 SDK, build succeeds.

Review URL: http://codereview.chromium.org/2717001

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

3 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index ebb12e0..b97bf7c 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -1649,7 +1649,6 @@ const int kDisabledIndex = 1;
   NSButton* cancelButton = [alert addButtonWithTitle:
       l10n_util::GetNSString(IDS_OPTIONS_RESET_CANCELLABEL)];
   [cancelButton setKeyEquivalent:@"\r"];
-  [alert setDelegate:self];
 
   [alert beginSheetModalForWindow:[self window]
                     modalDelegate:self
diff --git a/chrome/browser/cocoa/tab_view_picker_table.h b/chrome/browser/cocoa/tab_view_picker_table.h
index 4255fec4..43784d3 100644
--- a/chrome/browser/cocoa/tab_view_picker_table.h
+++ b/chrome/browser/cocoa/tab_view_picker_table.h
@@ -4,13 +4,17 @@
 
 #import <Cocoa/Cocoa.h>
 
+#import "base/cocoa_protocols_mac.h"
+
 // TabViewPickerTable is an NSTableView that can be used to switch between the
 // NSTabViewItems of an NSTabView. To use this, just create a
 // TabViewPickerTable in Interface Builder and connect the |tabView_| outlet
 // to an NSTabView. Now the table is automatically populated with the tab labels
 // of the tab view, clicking the table updates the tab view, and switching
 // tab view items updates the selection of the table.
-@interface TabViewPickerTable : NSTableView {
+@interface TabViewPickerTable : NSTableView <NSTabViewDelegate,
+                                            NSTableViewDelegate,
+                                            NSTableViewDataSource> {
  @public
   IBOutlet NSTabView* tabView_;  // Visible for testing.
 
diff --git a/chrome/browser/cocoa/tab_view_picker_table_unittest.mm b/chrome/browser/cocoa/tab_view_picker_table_unittest.mm
index 69f5a52..08459d2 100644
--- a/chrome/browser/cocoa/tab_view_picker_table_unittest.mm
+++ b/chrome/browser/cocoa/tab_view_picker_table_unittest.mm
@@ -6,12 +6,13 @@
 
 #import "chrome/browser/cocoa/tab_view_picker_table.h"
 
+#import "base/cocoa_protocols_mac.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
-@interface TabViewPickerTableTestPing : NSObject {
+@interface TabViewPickerTableTestPing : NSObject <NSTabViewDelegate> {
  @public
   BOOL didSelectItemCalled_;
 }