Fix Mac 10.6 SDK compile errors found with Clang.

BUG=none
TEST=Build Chromium with the 10.6 SDK using clang. It works.

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

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

4 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.h b/chrome/browser/ui/cocoa/dev_tools_controller.h
index 7de513e..0875e15 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller.h
+++ b/chrome/browser/ui/cocoa/dev_tools_controller.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "base/mac/cocoa_protocols.h"
 #include "base/memory/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
@@ -20,7 +21,7 @@ class TabContents;
 // A class that handles updates of the devTools view within a browser window.
 // It swaps in the relevant devTools contents for a given TabContents or removes
 // the view, if there's no devTools contents to show.
-@interface DevToolsController : NSObject {
+@interface DevToolsController : NSObject<NSSplitViewDelegate> {
  @private
   // A view hosting docked devTools contents.
   scoped_nsobject<NSSplitView> splitView_;
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.h b/chrome/browser/ui/cocoa/html_dialog_window_controller.h
index b4d0f3e..c0a1d6e 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.h
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.h
@@ -9,6 +9,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 
@@ -18,7 +19,7 @@ class TabContents;
 
 // This controller manages a dialog box with properties and HTML content taken
 // from a HTMLDialogUIDelegate object.
-@interface HtmlDialogWindowController : NSWindowController {
+@interface HtmlDialogWindowController : NSWindowController<NSWindowDelegate> {
  @private
   // Order here is important, as tab_contents_ may send messages to
   // delegate_ when it gets destroyed.
diff --git a/chrome/browser/ui/cocoa/sidebar_controller.h b/chrome/browser/ui/cocoa/sidebar_controller.h
index 1eb3c83..54066df 100644
--- a/chrome/browser/ui/cocoa/sidebar_controller.h
+++ b/chrome/browser/ui/cocoa/sidebar_controller.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "base/mac/cocoa_protocols.h"
 #include "base/memory/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 
@@ -19,7 +20,7 @@ class TabContents;
 // A class that handles updates of the sidebar view within a browser window.
 // It swaps in the relevant sidebar contents for a given TabContents or removes
 // the vew, if there's no sidebar contents to show.
-@interface SidebarController : NSObject {
+@interface SidebarController : NSObject<NSSplitViewDelegate> {
  @private
   // A view hosting sidebar contents.
   scoped_nsobject<NSSplitView> splitView_;
diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
index a72304b..64e3856 100644
--- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
+++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h
@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#import "base/mac/cocoa_protocols.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
@@ -23,7 +24,7 @@ const BackForwardMenuType BACK_FORWARD_MENU_TYPE_FORWARD =
 // A class that manages the back/forward menu (and delayed-menu button, and
 // model).
 
-@interface BackForwardMenuController : NSObject {
+@interface BackForwardMenuController : NSObject<NSMenuDelegate> {
  @private
   BackForwardMenuType type_;
   MenuButton* button_;  // Weak; comes from nib.