Fix warnings relating to the embedding container protocols.

camino/src/browser/KeychainService.mm

@@ -1044,7 +1044,11 @@ KeychainFormSubmitObserver::CheckChangeDataYN(nsIDOMWindowInternal* window)
 {
 }
 
-- (void)onProgressChange:(int)currentBytes outOf:(int)maxBytes
+- (void)onProgressChange:(long)currentBytes outOf:(long)maxBytes
+{
+}
+
+- (void)onProgressChange64:(long long)currentBytes outOf:(long long)maxBytes
 {
 }
 
@@ -1076,6 +1080,10 @@ KeychainFormSubmitObserver::CheckChangeDataYN(nsIDOMWindowInternal* window)
 {
 }
 
+- (void)onFoundShortcutIcon:(NSString*)inIconURI
+{
+}
+
 @end
 
 //

camino/src/embedding/CHBrowserListener.h

@@ -81,7 +81,7 @@ public:
   void AddListener(id <CHBrowserListener> aListener);
   void RemoveListener(id <CHBrowserListener> aListener);
 
-  void SetContainer(id <CHBrowserContainer> aContainer);
+  void SetContainer(NSView<CHBrowserListener, CHBrowserContainer>* aContainer);
 
 protected:
 
@@ -91,7 +91,7 @@ protected:
 private:
   CHBrowserView*          mView;     // WEAK - it owns us
   NSMutableArray*         mListeners;
-  id <CHBrowserContainer> mContainer;
+  NSView<CHBrowserListener, CHBrowserContainer>* mContainer;
   PRBool                  mIsModal;
   PRUint32                mChromeFlags;
 };

camino/src/embedding/CHBrowserListener.mm

@@ -670,7 +670,7 @@ CHBrowserListener::RemoveListener(id <CHBrowserListener> aListener)
 }
 
 void 
-CHBrowserListener::SetContainer(id <CHBrowserContainer> aContainer)
+CHBrowserListener::SetContainer(NSView<CHBrowserListener, CHBrowserContainer>* aContainer)
 {
   [mContainer autorelease];
   mContainer = aContainer;

camino/src/embedding/CHBrowserView.h

@@ -69,7 +69,9 @@ class nsISupports;
 // Invoked regularly as data associated with a page streams
 // in. If the total number of bytes expected is unknown,
 // maxBytes is -1.
-- (void)onProgressChange:(int)currentBytes outOf:(int)maxBytes;
+- (void)onProgressChange:(long)currentBytes outOf:(long)maxBytes;
+- (void)onProgressChange64:(long long)currentBytes outOf:(long long)maxBytes;
+
 - (void)onLocationChange:(NSString*)urlSpec requestOK:(BOOL)isOK;
 - (void)onStatusChange:(NSString*)aMessage;
 - (void)onSecurityStateChange:(unsigned long)newState;
@@ -155,7 +157,7 @@ enum {
 // nsIWebBrowser methods
 - (void)addListener:(id <CHBrowserListener>)listener;
 - (void)removeListener:(id <CHBrowserListener>)listener;
-- (void)setContainer:(id <CHBrowserContainer>)container;
+- (void)setContainer:(NSView<CHBrowserListener, CHBrowserContainer>*)container;
 - (nsIDOMWindow*)getContentWindow;	// addrefs
 
 // nsIWebNavigation methods

camino/src/embedding/CHBrowserView.mm

@@ -263,7 +263,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
     _listener->RemoveListener(listener);
 }
 
-- (void)setContainer:(id <CHBrowserContainer>)container
+- (void)setContainer:(NSView<CHBrowserListener, CHBrowserContainer>*)container
 {
   if ( _listener )
     _listener->SetContainer(container);