Diff for /chimera/MyBrowserView.mm between versions 1.28 and 1.32

version 1.28, 2002/04/12 01:16:44 version 1.32, 2002/04/17 19:33:46
Line 128  static const char* ioServiceContractID = Line 128  static const char* ioServiceContractID =
   [status setStringValue:loadingStatus];    [status setStringValue:loadingStatus];
       
   mIsPrimary = YES;    mIsPrimary = YES;
 
   if ([[self window] isKeyWindow])
     [browserView setActive: YES];
   
   nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));    nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));
   if (!ioService)    if (!ioService)
     return;      return;
Line 306  static const char* ioServiceContractID = Line 309  static const char* ioServiceContractID =
 // Called when a context menu should be shown.  // Called when a context menu should be shown.
 - (void)onShowContextMenu:(int)flags domEvent:(nsIDOMEvent*)aEvent domNode:(nsIDOMNode*)aNode  - (void)onShowContextMenu:(int)flags domEvent:(nsIDOMEvent*)aEvent domNode:(nsIDOMNode*)aNode
 {  {
     [mWindowController onShowContextMenu: flags domEvent: aEvent domNode: aNode];
   }
   
   -(NSMenu*)getContextMenu
   {
     return [mWindowController getContextMenu];
 }  }
   
 - (void)offlineModeChanged: (NSNotification*)aNotification  - (void)offlineModeChanged: (NSNotification*)aNotification
Line 342  static const char* ioServiceContractID = Line 350  static const char* ioServiceContractID =
 }  }
   
 #define NS_POPUP_BLOCK @"This Web site is attempting to open an unrequested popup window.  Navigator can \  #define NS_POPUP_BLOCK @"This Web site is attempting to open an unrequested popup window.  Navigator can \
automatically prevent Web sites from opening popup advertisements.  Would you like to turn on \automatically prevent Web sites from opening popup advertisements.  Click OK to prevent all \
popup blocking now?"unrequested popups (including this one) from opening."
   
- (NSBrowserView*)createBrowserWindow:(unsigned int)mask- (NSBrowserView*)createBrowserWindow:(unsigned int)aMask
 {  {
   nsCOMPtr<nsIPrefBranch> pref(do_GetService("@mozilla.org/preferences-service;1"));    nsCOMPtr<nsIPrefBranch> pref(do_GetService("@mozilla.org/preferences-service;1"));
   if (!pref)    if (!pref)
Line 363  popup blocking now?" Line 371  popup blocking now?"
       // A popup is being opened while the page is currently loading.  Offer to block the        // A popup is being opened while the page is currently loading.  Offer to block the
       // popup.        // popup.
       nsAlertController* controller = nsCocoaBrowserService::GetAlertController();        nsAlertController* controller = nsCocoaBrowserService::GetAlertController();
      BOOL checkValue = YES;      BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected"
      BOOL confirm = [controller confirmCheck: [self window] title: @"Unrequested Popup Detected"                                text: NS_POPUP_BLOCK];
                                text: NS_POPUP_BLOCK
                                checkMsg:@"Always ask before opening unrequested popups." checkValue: &checkValue];      // This is a one-time dialog.
      PRBool needToSave = PR_FALSE;      pref->SetBoolPref("browser.popups.showPopupBlocker", PR_FALSE);
      if (checkValue != showBlocker) { 
        needToSave = PR_TRUE; 
        pref->SetBoolPref("browser.popups.showPopupBlocker", checkValue); 
      } 
               
       if (confirm) {        if (confirm) {
         needToSave = PR_TRUE;  
         pref->SetBoolPref("dom.disable_open_during_load", PR_TRUE);          pref->SetBoolPref("dom.disable_open_during_load", PR_TRUE);
         pref->SetIntPref("dom.disable_open_click_delay", 1000);          pref->SetIntPref("dom.disable_open_click_delay", 1000);
       }        }
   
      if (needToSave) {      nsCOMPtr<nsIPrefService> prefService(do_QueryInterface(pref));
        nsCOMPtr<nsIPrefService> prefService(do_QueryInterface(pref));      prefService->SavePrefFile(nsnull);
        prefService->SavePrefFile(nsnull); 
      } 
               
       if (confirm)        if (confirm)
         return nil;          return nil;
Line 390  popup blocking now?" Line 391  popup blocking now?"
   }    }
       
   BrowserWindowController* controller = [[BrowserWindowController alloc] initWithWindowNibName: @"BrowserWindow"];    BrowserWindowController* controller = [[BrowserWindowController alloc] initWithWindowNibName: @"BrowserWindow"];
     [controller setChromeMask: aMask];
   [controller disableAutosave]; // The Web page opened this window, so we don't ever use its settings.    [controller disableAutosave]; // The Web page opened this window, so we don't ever use its settings.
   [controller enterModalSession];    [controller enterModalSession];
     [[[controller getMyBrowserView] getBrowserView] setActive: YES];
   return [[controller getMyBrowserView] getBrowserView];    return [[controller getMyBrowserView] getBrowserView];
 }  }
   

Removed from v.1.28  
changed lines
  Added in v.1.32


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>