From e5811f54c865fefadc311bb6cdd93be9ec91e55b Mon Sep 17 00:00:00 2001
From: "nick.kreeger%park.edu" <nick.kreeger%park.edu>
Date: Sat, 12 Aug 2006 18:22:15 +0000
Subject: [PATCH] Missed a file for bug 310395. Also removing some method
 declarations that were not caught due to a older patch.

---
 camino/src/browser/BrowserWindowController.h | 3 ++-
 camino/src/browser/BrowserWrapper.h          | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/camino/src/browser/BrowserWindowController.h b/camino/src/browser/BrowserWindowController.h
index 521cde92bcf6..25ae84d1d8ea 100644
--- a/camino/src/browser/BrowserWindowController.h
+++ b/camino/src/browser/BrowserWindowController.h
@@ -183,7 +183,8 @@ typedef enum
 - (BrowserTabView*)getTabBrowser;
 - (BrowserWrapper*)getBrowserWrapper;
 
-- (void)loadURL:(NSString*)aURLSpec referrer:(NSString*)aReferrer activate:(BOOL)activate allowPopups:(BOOL)inAllowPopups;
+- (void)loadURL:(NSString*)aURLSpec referrer:(NSString*)aReferrer focusContent:(BOOL)focusContent allowPopups:(BOOL)inAllowPopups;
+- (void)loadURL:(NSString*)aURLSpec;
 
 - (void)focusURLBar;
 
diff --git a/camino/src/browser/BrowserWrapper.h b/camino/src/browser/BrowserWrapper.h
index c2cb42aeb841..34588540e42f 100644
--- a/camino/src/browser/BrowserWrapper.h
+++ b/camino/src/browser/BrowserWrapper.h
@@ -200,7 +200,6 @@ class nsIArray;
 - (IBAction)hideBlockedPopupView:(id)sender;
 
 - (void)loadURI:(NSString *)urlSpec referrer:(NSString*)referrer flags:(unsigned int)flags focusContent:(BOOL)focusContent allowPopups:(BOOL)inAllowPopups;
-- (void)loadURI:(NSString *)urlSpec referrer:(NSString*)referrer flags:(unsigned int)flags activate:(BOOL)activate allowPopups:(BOOL)inAllowPopups;
 
 - (void)didBecomeActiveBrowser;
 - (void)willResignActiveBrowser;