Hook up "Do not load home page when opening new tab" pref (bug 154288). r=pinkerton.

camino/BrowserWindowController.mm

@@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
 
 -(void)newTab
 {
+    PRInt32 newTabPage = 0;
+    nsCOMPtr<nsIPrefBranch> pref(do_GetService("@mozilla.org/preferences-service;1"));
+    pref->GetIntPref("browser.tabs.startPage", &newTabPage);
+
     NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
     CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
-    
-    [newTab setLabel: @"Untitled"];
+
+    [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")];
     [newTab setView: newView];
     [mTabBrowser addTabViewItem: newTab];
-    
-    [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone];
+
+    [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone];
 
     [mTabBrowser selectLastTabViewItem: self];
 

camino/PreferencePanes/Navigation/Navigation.mm

@@ -64,7 +64,7 @@ const int kDefaultExpireDays = 9;
   if (NS_SUCCEEDED(rv) && intPref == 0)
     [checkboxNewWindowBlank setState:YES];
 
-  rv = mPrefService->GetIntPref("chimera.new_tab_page", &intPref);
+  rv = mPrefService->GetIntPref("browser.tabs.startPage", &intPref);
   if (NS_SUCCEEDED(rv) && intPref == 0)
     [checkboxNewTabBlank setState:YES];
 
@@ -141,7 +141,7 @@ const int kDefaultExpireDays = 9;
 
   char *prefName = NULL;
   if (sender == checkboxNewTabBlank)
-    prefName = "chimera.new_tab_page";
+    prefName = "browser.tabs.page";
   else if (sender == checkboxNewWindowBlank)
     prefName = "browser.startup.page";
   else

camino/src/browser/BrowserWindowController.mm

@@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
 
 -(void)newTab
 {
+    PRInt32 newTabPage = 0;
+    nsCOMPtr<nsIPrefBranch> pref(do_GetService("@mozilla.org/preferences-service;1"));
+    pref->GetIntPref("browser.tabs.startPage", &newTabPage);
+
     NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
     CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
-    
-    [newTab setLabel: @"Untitled"];
+
+    [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")];
     [newTab setView: newView];
     [mTabBrowser addTabViewItem: newTab];
-    
-    [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone];
+
+    [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone];
 
     [mTabBrowser selectLastTabViewItem: self];
 

chimera/BrowserWindowController.mm

@@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
 
 -(void)newTab
 {
+    PRInt32 newTabPage = 0;
+    nsCOMPtr<nsIPrefBranch> pref(do_GetService("@mozilla.org/preferences-service;1"));
+    pref->GetIntPref("browser.tabs.startPage", &newTabPage);
+
     NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
     CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
-    
-    [newTab setLabel: @"Untitled"];
+
+    [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")];
     [newTab setView: newView];
     [mTabBrowser addTabViewItem: newTab];
-    
-    [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone];
+
+    [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone];
 
     [mTabBrowser selectLastTabViewItem: self];
 

chimera/PreferencePanes/Navigation/Navigation.mm

@@ -64,7 +64,7 @@ const int kDefaultExpireDays = 9;
   if (NS_SUCCEEDED(rv) && intPref == 0)
     [checkboxNewWindowBlank setState:YES];
 
-  rv = mPrefService->GetIntPref("chimera.new_tab_page", &intPref);
+  rv = mPrefService->GetIntPref("browser.tabs.startPage", &intPref);
   if (NS_SUCCEEDED(rv) && intPref == 0)
     [checkboxNewTabBlank setState:YES];
 
@@ -141,7 +141,7 @@ const int kDefaultExpireDays = 9;
 
   char *prefName = NULL;
   if (sender == checkboxNewTabBlank)
-    prefName = "chimera.new_tab_page";
+    prefName = "browser.tabs.page";
   else if (sender == checkboxNewWindowBlank)
     prefName = "browser.startup.page";
   else

chimera/src/browser/BrowserWindowController.mm

@@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
 
 -(void)newTab
 {
+    PRInt32 newTabPage = 0;
+    nsCOMPtr<nsIPrefBranch> pref(do_GetService("@mozilla.org/preferences-service;1"));
+    pref->GetIntPref("browser.tabs.startPage", &newTabPage);
+
     NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
     CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease];
-    
-    [newTab setLabel: @"Untitled"];
+
+    [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")];
     [newTab setView: newView];
     [mTabBrowser addTabViewItem: newTab];
-    
-    [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone];
+
+    [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone];
 
     [mTabBrowser selectLastTabViewItem: self];