Bug 1117635 - Declare that MacApplicationDelegate implements the NSApplicationDelegate protocol. r=mstange

toolkit/xre/MacApplicationDelegate.mm

@@ -16,6 +16,7 @@
 #include "nsCOMPtr.h"
 #include "nsINativeAppSupport.h"
 #include "nsAppRunner.h"
+#include "nsAppShell.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIServiceManager.h"
 #include "nsServiceManagerUtils.h"
@@ -46,7 +47,7 @@ private:
   NSAutoreleasePool *mLocalPool;
 };
 
-@interface MacApplicationDelegate : NSObject
+@interface MacApplicationDelegate : NSObject<NSApplicationDelegate>
 {
 }
 
@@ -54,8 +55,6 @@ private:
 
 static bool sProcessedGetURLEvent = false;
 
-@class GeckoNSApplication;
-
 // Methods that can be called from non-Objective-C code.
 
 // This is needed, on relaunch, to force the OS to use the "Cocoa Dock API"
@@ -89,8 +88,8 @@ SetupMacApplicationDelegate()
                                             forKey:@"NSTreatUnknownArgumentsAsOpen"];
 
   // Create the delegate. This should be around for the lifetime of the app.
-  MacApplicationDelegate *delegate = [[MacApplicationDelegate alloc] init];
-  [NSApp setDelegate:delegate];
+  id<NSApplicationDelegate> delegate = [[MacApplicationDelegate alloc] init];
+  [[GeckoNSApplication sharedApplication] setDelegate:delegate];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }

toolkit/xre/moz.build

@@ -155,6 +155,12 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    LOCAL_INCLUDES += [
+        '/widget',
+        '/widget/cocoa',
+    ]
+
 if CONFIG['MOZ_ENABLE_XREMOTE']:
     LOCAL_INCLUDES += [
         '/widget/xremoteclient',