Hookup mozilla pref about re-using the window on a GURL event

camino/BrowserWindowController.h

@@ -108,6 +108,7 @@ class nsIDOMNode;
 -(CHBrowserWrapper*)getBrowserWrapper;
 
 - (void)loadURL:(NSURL*)aURL;
+- (void)loadURLString:(NSString*)aStr;
 - (void)updateLocationFields:(NSString *)locationString;
 - (void)updateToolbarItems;
 - (void)focusURLBar;

camino/BrowserWindowController.mm

@@ -564,6 +564,12 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 }
 
 
+-(void)loadURLString:(NSString*)aStr
+{
+  [self loadURL:[NSURL URLWithString:aStr]];
+}
+
+
 -(void)loadURL:(NSURL*)aURL
 {
     if (mInitialized) {

camino/CHGetURLCommand.mm

@@ -24,11 +24,34 @@
 #import "CHGetURLCommand.h"
 #import <AppKit/AppKit.h>
 
+#import "BrowserWindowController.h"
+
+#include "nsIPref.h"
+#include "nsCOMPtr.h"
+#include "nsIServiceManagerUtils.h"
+
 @implementation CHGetURLCommand
 
-- (id)performDefaultImplementation {
-  id controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+- (id)performDefaultImplementation 
+{
+  // get the pref that specifies if we want to re-use the existing window or
+  // open a new one. There's really no point caching this pref.
+  PRBool reuseWindow = PR_FALSE;
+  nsCOMPtr<nsIPref> prefService ( do_GetService(NS_PREF_CONTRACTID) );
+  if ( prefService )
+    prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
+  
+  BrowserWindowController* controller = nsnull;
+  if ( reuseWindow ) {
+    controller = [[NSApp mainWindow] windowController];
+    [controller loadURLString:[self directParameter]];
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
+  }
+  else
+    controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+
   [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
   return nil;
 }
+
 @end

camino/src/appleevents/GetURLCommand.mm

@@ -24,11 +24,34 @@
 #import "CHGetURLCommand.h"
 #import <AppKit/AppKit.h>
 
+#import "BrowserWindowController.h"
+
+#include "nsIPref.h"
+#include "nsCOMPtr.h"
+#include "nsIServiceManagerUtils.h"
+
 @implementation CHGetURLCommand
 
-- (id)performDefaultImplementation {
-  id controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+- (id)performDefaultImplementation 
+{
+  // get the pref that specifies if we want to re-use the existing window or
+  // open a new one. There's really no point caching this pref.
+  PRBool reuseWindow = PR_FALSE;
+  nsCOMPtr<nsIPref> prefService ( do_GetService(NS_PREF_CONTRACTID) );
+  if ( prefService )
+    prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
+  
+  BrowserWindowController* controller = nsnull;
+  if ( reuseWindow ) {
+    controller = [[NSApp mainWindow] windowController];
+    [controller loadURLString:[self directParameter]];
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
+  }
+  else
+    controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+
   [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
   return nil;
 }
+
 @end

camino/src/browser/BrowserWindowController.h

@@ -108,6 +108,7 @@ class nsIDOMNode;
 -(CHBrowserWrapper*)getBrowserWrapper;
 
 - (void)loadURL:(NSURL*)aURL;
+- (void)loadURLString:(NSString*)aStr;
 - (void)updateLocationFields:(NSString *)locationString;
 - (void)updateToolbarItems;
 - (void)focusURLBar;

camino/src/browser/BrowserWindowController.mm

@@ -564,6 +564,12 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 }
 
 
+-(void)loadURLString:(NSString*)aStr
+{
+  [self loadURL:[NSURL URLWithString:aStr]];
+}
+
+
 -(void)loadURL:(NSURL*)aURL
 {
     if (mInitialized) {

chimera/BrowserWindowController.h

@@ -108,6 +108,7 @@ class nsIDOMNode;
 -(CHBrowserWrapper*)getBrowserWrapper;
 
 - (void)loadURL:(NSURL*)aURL;
+- (void)loadURLString:(NSString*)aStr;
 - (void)updateLocationFields:(NSString *)locationString;
 - (void)updateToolbarItems;
 - (void)focusURLBar;

chimera/BrowserWindowController.mm

@@ -564,6 +564,12 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 }
 
 
+-(void)loadURLString:(NSString*)aStr
+{
+  [self loadURL:[NSURL URLWithString:aStr]];
+}
+
+
 -(void)loadURL:(NSURL*)aURL
 {
     if (mInitialized) {

chimera/CHGetURLCommand.mm

@@ -24,11 +24,34 @@
 #import "CHGetURLCommand.h"
 #import <AppKit/AppKit.h>
 
+#import "BrowserWindowController.h"
+
+#include "nsIPref.h"
+#include "nsCOMPtr.h"
+#include "nsIServiceManagerUtils.h"
+
 @implementation CHGetURLCommand
 
-- (id)performDefaultImplementation {
-  id controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+- (id)performDefaultImplementation 
+{
+  // get the pref that specifies if we want to re-use the existing window or
+  // open a new one. There's really no point caching this pref.
+  PRBool reuseWindow = PR_FALSE;
+  nsCOMPtr<nsIPref> prefService ( do_GetService(NS_PREF_CONTRACTID) );
+  if ( prefService )
+    prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
+  
+  BrowserWindowController* controller = nsnull;
+  if ( reuseWindow ) {
+    controller = [[NSApp mainWindow] windowController];
+    [controller loadURLString:[self directParameter]];
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
+  }
+  else
+    controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+
   [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
   return nil;
 }
+
 @end

chimera/src/appleevents/GetURLCommand.mm

@@ -24,11 +24,34 @@
 #import "CHGetURLCommand.h"
 #import <AppKit/AppKit.h>
 
+#import "BrowserWindowController.h"
+
+#include "nsIPref.h"
+#include "nsCOMPtr.h"
+#include "nsIServiceManagerUtils.h"
+
 @implementation CHGetURLCommand
 
-- (id)performDefaultImplementation {
-  id controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+- (id)performDefaultImplementation 
+{
+  // get the pref that specifies if we want to re-use the existing window or
+  // open a new one. There's really no point caching this pref.
+  PRBool reuseWindow = PR_FALSE;
+  nsCOMPtr<nsIPref> prefService ( do_GetService(NS_PREF_CONTRACTID) );
+  if ( prefService )
+    prefService->GetBoolPref("browser.always_reuse_window", &reuseWindow);
+  
+  BrowserWindowController* controller = nsnull;
+  if ( reuseWindow ) {
+    controller = [[NSApp mainWindow] windowController];
+    [controller loadURLString:[self directParameter]];
+    [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
+  }
+  else
+    controller = [[NSApp delegate] openBrowserWindowWithURLString: [self directParameter]];
+
   [[[controller getBrowserWrapper] getBrowserView] setActive: YES];
   return nil;
 }
+
 @end

chimera/src/browser/BrowserWindowController.h

@@ -108,6 +108,7 @@ class nsIDOMNode;
 -(CHBrowserWrapper*)getBrowserWrapper;
 
 - (void)loadURL:(NSURL*)aURL;
+- (void)loadURLString:(NSString*)aStr;
 - (void)updateLocationFields:(NSString *)locationString;
 - (void)updateToolbarItems;
 - (void)focusURLBar;

chimera/src/browser/BrowserWindowController.mm

@@ -564,6 +564,12 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 }
 
 
+-(void)loadURLString:(NSString*)aStr
+{
+  [self loadURL:[NSURL URLWithString:aStr]];
+}
+
+
 -(void)loadURL:(NSURL*)aURL
 {
     if (mInitialized) {