From 9371f49703b5b126f159a0669d3bf9cdce3fd43f Mon Sep 17 00:00:00 2001
From: "pinkerton%netscape.com" <pinkerton%netscape.com>
Date: Wed, 14 May 2003 03:45:06 +0000
Subject: [PATCH] add indicator of blocked popup and a popdown menu to quickly
 unblock sites

---
 camino/Chimera.pbproj/project.pbxproj         |  21 ++
 .../BrowserWindow.nib/classes.nib             |   4 +
 .../English.lproj/BrowserWindow.nib/info.nib  |  14 +-
 .../BrowserWindow.nib/objects.nib             | Bin 24500 -> 25276 bytes
 camino/src/application/MainController.mm      |   2 +-
 camino/src/browser/BrowserWindowController.h  |  10 +
 camino/src/browser/BrowserWindowController.mm | 197 +++++++++++++++++-
 camino/src/browser/BrowserWrapper.h           |   7 +
 camino/src/browser/BrowserWrapper.mm          |  35 +++-
 camino/src/browser/KeychainService.mm         |   4 +
 camino/src/embedding/CHBrowserListener.h      |   3 +
 camino/src/embedding/CHBrowserListener.mm     |  20 +-
 camino/src/embedding/CHBrowserView.h          |   4 +-
 camino/src/embedding/CHBrowserView.mm         |   6 +
 14 files changed, 311 insertions(+), 16 deletions(-)

diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj
index 3518703ecd49..406fb25d0108 100644
--- a/camino/Chimera.pbproj/project.pbxproj
+++ b/camino/Chimera.pbproj/project.pbxproj
@@ -841,6 +841,7 @@
 				3003B8A4044514B600B85BF3,
 				3003B8A5044514B600B85BF3,
 				3003B8AD044514E300B85BF3,
+				3FAD95550461E43700A80005,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1390,6 +1391,24 @@
 			settings = {
 			};
 		};
+		3F8D26DE0471ED0F00A80005 = {
+			fileRef = 3FAD95540461E43700A80005;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		3FAD95540461E43700A80005 = {
+			isa = PBXFileReference;
+			name = "popup-blocked.png";
+			path = "resources/images/chrome/popup-blocked.png";
+			refType = 2;
+		};
+		3FAD95550461E43700A80005 = {
+			fileRef = 3FAD95540461E43700A80005;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 //3F0
 //3F1
 //3F2
@@ -1921,6 +1940,7 @@
 				F557149E023B46BF010001CA,
 				F540BD1A029ED15301026D5D,
 				F540BD1C029ED17901026D5D,
+				3FAD95540461E43700A80005,
 				F5A112C902DF270F01026D5D,
 				F55B6BF402EF1F7E01026D5D,
 				F583E3B503B8204901A80166,
@@ -7930,6 +7950,7 @@
 				3003B8A9044514B600B85BF3,
 				3003B8AA044514B600B85BF3,
 				3003B8AE044514E300B85BF3,
+				3F8D26DE0471ED0F00A80005,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index 9ae7c167d3de..f85041e1c7ac 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -90,6 +90,7 @@
                 closeCurrentTab = id; 
                 closeOtherTabs = id; 
                 closeSendersTab = id; 
+                configurePopupBlocking = id; 
                 copyImage = id; 
                 copyImageLocation = id; 
                 copyLinkLocation = id; 
@@ -127,6 +128,8 @@
                 stop = id; 
                 toggleBookmarkManager = id; 
                 toggleSidebar = id; 
+                unblockAllSites = id; 
+                unblockSite = id; 
                 viewOnlyThisImage = id; 
                 viewPageSource = id; 
                 viewSource = id; 
@@ -154,6 +157,7 @@
                 mLock = NSImageView; 
                 mPageMenu = NSMenu; 
                 mPersonalToolbar = BookmarksToolbar; 
+                mPopupBlocked = NSButton; 
                 mProgress = NSProgressIndicator; 
                 mProxyIcon = PageProxyIcon; 
                 mSearchBar = SearchTextField; 
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 914861122721..d95e74dd428e 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>50 101 653 383 0 0 1024 746 </string>
+	<string>122 60 653 383 0 0 1280 832 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>124</key>
@@ -23,16 +23,18 @@
 		<key>463</key>
 		<string>268 375 213 264 0 0 1280 832 </string>
 		<key>56</key>
-		<string>355 485 314 64 0 0 1024 746 </string>
+		<string>483 539 314 64 0 0 1280 832 </string>
 		<key>654</key>
 		<string>159 629 198 144 0 0 1280 832 </string>
 		<key>731</key>
 		<string>185 277 654 459 0 0 1024 746 </string>
 		<key>801</key>
 		<string>418 469 201 79 0 0 1024 746 </string>
+		<key>826</key>
+		<string>96 451 213 78 0 0 1280 832 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>286.0</string>
+	<string>291.0</string>
 	<key>IBGroupedObjects</key>
 	<dict>
 		<key>7</key>
@@ -45,11 +47,7 @@
 	<string>8</string>
 	<key>IBLockedObjects</key>
 	<array/>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>56</integer>
-	</array>
 	<key>IBSystem Version</key>
-	<string>6L29</string>
+	<string>6I32</string>
 </dict>
 </plist>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 99c869ac50e6e9df9a8bc7d1794dada5d4518e90..f1b2c0801a1fb2961f6576576f043e1e0eff2ea4 100644
GIT binary patch
literal 25276
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

literal 24500
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

diff --git a/camino/src/application/MainController.mm b/camino/src/application/MainController.mm
index 22246ef68cd4..cbec143933d2 100644
--- a/camino/src/application/MainController.mm
+++ b/camino/src/application/MainController.mm
@@ -173,7 +173,7 @@ const int kReuseWindowOnAE = 2;
   // initialize if we haven't already.
   [self preferenceManager];
   
-	[self setupStartpage];
+  [self setupStartpage];
 
   // register our app components with the embed layer
   unsigned int numComps = 0;
diff --git a/camino/src/browser/BrowserWindowController.h b/camino/src/browser/BrowserWindowController.h
index 524e0d6dc686..1e4d987d8eec 100644
--- a/camino/src/browser/BrowserWindowController.h
+++ b/camino/src/browser/BrowserWindowController.h
@@ -107,6 +107,7 @@ typedef enum
   IBOutlet NSTextField*       mStatus;
   IBOutlet NSProgressIndicator* mProgress;              // STRONG reference
   IBOutlet NSImageView*       mLock;
+  IBOutlet NSButton*          mPopupBlocked;
   IBOutlet NSWindow*          mLocationSheetWindow;
   IBOutlet NSTextField*       mLocationSheetURLField;
   IBOutlet NSView*            mStatusBar;     // contains the status text, progress bar, and lock
@@ -183,6 +184,7 @@ typedef enum
   // could be an outlet, but i figure it's easier to get it at runtime thereby saving
   // someone from messing up in the nib when making changes.
   NSView* mProgressSuperview;                // WEAK ptr
+  NSView* mPopupBlockSuperview;              // WEAK ptr
   
   nsIURIFixup* mURIFixer;                   // [STRONG] should be nsCOMPtr, but can't
   nsIBrowserHistory* mGlobalHistory;        // [STRONG] should be nsCOMPtr, but can't
@@ -205,6 +207,14 @@ typedef enum
     // call to update the image of the lock icon with a value from nsIWebProgressListener
 - (void)updateLock:(unsigned int)securityState;
 
+    // call to update (show/hide) the image of the blocked-popup indicator and handle
+    // the items of the popup un-blocker menu
+- (void)showPopupBlocked:(BOOL)inBlocked;
+- (void)buildPopupBlockerMenu:(NSNotification*)notifer;
+- (IBAction)unblockSite:(id)sender;
+- (IBAction)unblockAllSites:(id)sender;
+- (IBAction)configurePopupBlocking:(id)sender;
+
 - (void)performAppropriateLocationAction;
 - (IBAction)goToLocationFromToolbarURLField:(id)sender;
 - (void)beginLocationSheet;
diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index 12664f9f29d7..9eea0240887d 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -79,6 +79,7 @@
 #include "nsIURI.h"
 #include "nsIURIFixup.h"
 #include "nsIBrowserHistory.h"
+#include "nsIPermissionManager.h"
 
 #include <QuickTime/QuickTime.h>
 
@@ -161,6 +162,52 @@ static NSArray* sToolbarDefaults = nil;
 @end
 //////////////////////////////////////
 
+#pragma mark -
+
+//
+// IconPopUpCell
+//
+// A popup cell that displays only an icon with no border, yet retains the
+// behaviors of a popup menu. It's amazing you can't get this w/out having
+// to subclass, but *shrug*.
+//
+@interface IconPopUpCell : NSPopUpButtonCell
+{
+@private
+  NSImage* fImage;
+  NSRect fSrcRect;      // rect cached for drawing, same size as image
+}
+- (id)initWithImage:(NSImage *)inImage;
+@end
+
+@implementation IconPopUpCell
+
+- (id)initWithImage:(NSImage *)inImage
+{
+  if ( (self = [super initTextCell:@"" pullsDown:YES]) )
+  {
+    fImage = [inImage retain];
+    fSrcRect = NSMakeRect(0,0,0,0);
+    fSrcRect.size = [fImage size];
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+  [fImage release];
+}
+
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+  [fImage setFlipped:[controlView isFlipped]];
+  cellFrame.size = fSrcRect.size;                  // don't scale
+  [fImage drawInRect:cellFrame fromRect:fSrcRect operation:NSCompositeSourceOver fraction:1.0];
+}
+
+@end
+
+#pragma mark -
 
 @interface BrowserWindowController(Private)
 - (void)setupToolbar;
@@ -358,6 +405,7 @@ static NSArray* sToolbarDefaults = nil;
   //  [mSidebarBrowserView windowClosed];
 
   [mProgress release];
+  [mPopupBlocked release];
   [mSearchBar release];
   [self stopThrobber];
   [mThrobberImages release];
@@ -387,13 +435,18 @@ static NSArray* sToolbarDefaults = nil;
       mProgress = nil;
       mStatus = nil;
       mLock = nil;
+      mPopupBlocked = nil;
     }
     else {
       // Retain with a single extra refcount. This allows us to remove
       // the progress meter from its superview without having to worry
       // about retaining and releasing it. Cache the superview of the
       // progress. Dynamically fetch the superview so as not to burden
-      // someone rearranging the nib with this detail.
+      // someone rearranging the nib with this detail. Note that this
+      // needs to be in a subview from the status bar because if the
+      // window resizes while it is hidden, its position wouldn't get updated.
+      // Having it in a separate view that stays visible (and is thus
+      // involved in the layout process) solves this.
       [mProgress retain];
       mProgressSuperview = [mProgress superview];
       
@@ -402,6 +455,26 @@ static NSArray* sToolbarDefaults = nil;
       // (radar 2194819), we need to make the text area opaque.
       [mStatus setBackgroundColor:[NSColor windowBackgroundColor]];
       [mStatus setDrawsBackground:YES];
+      
+      // create a new cell for our popup blocker item that draws just an image
+      // yet still retains the functionality of a popdown menu. Like the progress
+      // meter above, we retain so we can hide with impunity and grab its superview.
+      // However, unlike the progress meter, this doesn't need to be in a subview from
+      // the status bar because it is in a fixed position on the LHS.
+      [mPopupBlocked retain];
+      NSMenu* savedMenu = [mPopupBlocked menu];     // must cache this before replacing cell
+      IconPopUpCell* iconCell = [[[IconPopUpCell alloc] initWithImage:[NSImage imageNamed:@"popup-blocked"]] autorelease];
+      [mPopupBlocked setCell:iconCell];
+      //[iconCell setPreferredEdge:NSMinYEdge];
+      [iconCell setMenu:savedMenu];
+      [iconCell setBordered:NO];
+      mPopupBlockSuperview = [mPopupBlocked superview];
+      [self showPopupBlocked:NO];
+      
+      // register for notifications so we can populate the popup blocker menu
+      // right before it's displayed.
+      [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(buildPopupBlockerMenu:)
+                                              name:NSPopUpButtonCellWillPopUpNotification object:nil];
     }
 
     // Set up the toolbar's search text field
@@ -2220,6 +2293,128 @@ static NSArray* sToolbarDefaults = nil;
   [mProgress removeFromSuperview];
 }
 
+// 
+// - showPopupBlocked:
+//
+// Show/hide the image of the blocked-popup indicator
+//
+- (void)showPopupBlocked:(BOOL)inBlocked
+{
+  if ( inBlocked && ![mPopupBlocked window] ) {       // told to show, currently hidden
+    [mPopupBlockSuperview addSubview:mPopupBlocked];
+  }
+  else if ( !inBlocked && [mPopupBlocked window] ) {  // told to hide, currently visible                               
+    [mPopupBlocked removeFromSuperview];
+  }
+}
+
+//
+// buildPopupBlockerMenu:
+//
+// Called by the notification center right before the menu will be displayed. This
+// allows us the opportunity to populate its contents from the list of sites
+// in the block list.
+//
+- (void)buildPopupBlockerMenu:(NSNotification*)notifier
+{
+  const long kSeparatorTag = -1;
+  NSPopUpButton* popup = [notifier object];
+  
+  // clear out existing menu. loop until we hit our special tag
+  NSMenu* menu = [popup menu];
+  int numItemsToDelete = [popup indexOfItemWithTag:kSeparatorTag];
+  for ( int i = 0; i < numItemsToDelete; ++i ) 
+    [popup removeItemAtIndex:0];
+    
+  // the first item will get swallowed by the popup
+  [popup insertItemWithTitle:@"" atIndex:0];
+  
+  // fill in new menu
+  nsCOMPtr<nsISupportsArray> blockedSites;
+  [[self getBrowserWrapper] getBlockedSites:getter_AddRefs(blockedSites)];
+  PRUint32 siteCount = 0;
+  blockedSites->Count(&siteCount);
+  for ( PRUint32 i = 0; i < siteCount; ++i ) {
+    nsCOMPtr<nsISupports> genericURI = dont_AddRef(blockedSites->ElementAt(i));
+    nsCOMPtr<nsIURI> uri = do_QueryInterface(genericURI);
+    if ( uri ) {
+      // extract the host
+      nsCAutoString host;
+      uri->GetHost(host);
+      NSString* hostString = [NSString stringWithCString:host.get()];
+      
+      // create a new menu item and set its tag to the position in the menu so
+      // the action can know which site we want to unblock. Insert it at |i+1|
+      // because we had to pad with one item above, but set the tag to |i| because
+      // that's the index in the array.
+      const PRUint32 insertAt = i + 1;
+      NSString* itemTitle = [NSString stringWithFormat:NSLocalizedString(@"Unblock %@", @"Unblock %@"), hostString];
+      [popup insertItemWithTitle:itemTitle atIndex:insertAt];
+      NSMenuItem* currItem = [popup itemAtIndex:insertAt];
+      [currItem setAction:@selector(unblockSite:)];
+      [currItem setTarget:self];
+      [currItem setTag:i];
+    }
+  }
+}
+
+//
+// unblockSite:
+//
+// Called in response to an item in the unblock popup menu being selected to
+// add a particular site to the popup whitelist. We assume that the tag of
+// the sender is the index into the blocked sites array stores in the browser 
+// wrapper to get the nsURI.
+//
+- (IBAction)unblockSite:(id)sender
+{
+  nsCOMPtr<nsISupportsArray> blockedSites;
+  [[self getBrowserWrapper] getBlockedSites:getter_AddRefs(blockedSites)];
+
+  // get the tag from the sender and use that as the index into the list
+  long tag = [sender tag];
+  if ( tag >= 0 ) {
+    nsCOMPtr<nsISupports> genUri = dont_AddRef(blockedSites->ElementAt(tag));
+    nsCOMPtr<nsIURI> uri = do_QueryInterface(genUri);
+
+    nsCOMPtr<nsIPermissionManager> pm ( do_GetService(NS_PERMISSIONMANAGER_CONTRACTID) );
+    pm->Add(uri, nsIPermissionManager::POPUP_TYPE, nsIPermissionManager::ALLOW_ACTION);
+  }
+}
+
+//
+// - unblockAllSites:
+//
+// Called in response to the menu item from the unblock popup. Loop over all
+// the items in the blocked sites array in the browser wrapper and add them
+// to the whitelist.
+//
+- (IBAction)unblockAllSites:(id)sender
+{
+  nsCOMPtr<nsISupportsArray> blockedSites;
+  [[self getBrowserWrapper] getBlockedSites:getter_AddRefs(blockedSites)];
+  nsCOMPtr<nsIPermissionManager> pm ( do_GetService(NS_PERMISSIONMANAGER_CONTRACTID) );
+
+  PRUint32 count = 0;
+  blockedSites->Count(&count);
+  for ( PRUint32 i = 0; i < count; ++i ) {
+    nsCOMPtr<nsISupports> genUri = dont_AddRef(blockedSites->ElementAt(i));
+    nsCOMPtr<nsIURI> uri = do_QueryInterface(genUri);
+    pm->Add(uri, nsIPermissionManager::POPUP_TYPE, nsIPermissionManager::ALLOW_ACTION);   
+  }
+}
+
+//
+// -configurePopupBlocking
+//
+// Show the web features pref panel where the user can do things to configure
+// popup blocking
+//
+- (IBAction)configurePopupBlocking:(id)sender
+{
+  [[NSApp delegate] displayPreferencesWindow:self];
+  [[[NSApp delegate] preferencesController] selectPreferencePaneByIdentifier:@"org.mozilla.chimera.preference.webfeatures"];
+}
 
 //
 // updateLock:
diff --git a/camino/src/browser/BrowserWrapper.h b/camino/src/browser/BrowserWrapper.h
index 8ee95bdb2cd9..5834350d25c1 100644
--- a/camino/src/browser/BrowserWrapper.h
+++ b/camino/src/browser/BrowserWrapper.h
@@ -42,6 +42,8 @@
 @class ToolTip;
 @class AutoCompleteTextField;
 
+class nsISupportsArray;
+
 @interface BrowserWrapper : NSView <CHBrowserListener, CHBrowserContainer>
 {
   AutoCompleteTextField*    mUrlbar;
@@ -62,6 +64,9 @@
   NSString*                 mTitle;
     // the title we use for the tab. This differs for mTitle when the tab is loading
   NSString*                 mTabTitle;
+    // array of sites that have blocked popups. If nil, no sites are blocked. Cleared
+    // after each new page.
+  nsISupportsArray*         mBlockedSites;     // STRONG
 
   CHBrowserView*            mBrowserView;
   NSString*                 mDefaultStatusString;
@@ -92,6 +97,8 @@
 
 - (NSString*)getCurrentURLSpec;
 
+- (void)getBlockedSites:(nsISupportsArray**)outSites;
+
 - (void)loadURI:(NSString *)urlSpec referrer:(NSString*)referrer flags:(unsigned int)flags activate:(BOOL)activate;
 - (void)makePrimaryBrowserView: (id)aUrlbar status: (id)aStatus
           windowController: (BrowserWindowController*)aWindowController;
diff --git a/camino/src/browser/BrowserWrapper.mm b/camino/src/browser/BrowserWrapper.mm
index b9f2cd89a623..41f0c5151e59 100644
--- a/camino/src/browser/BrowserWrapper.mm
+++ b/camino/src/browser/BrowserWrapper.mm
@@ -113,7 +113,8 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
     mListenersAttached = NO;
     mSecureState = nsIWebProgressListener::STATE_IS_INSECURE;
     mProgress = 0.0;
-    
+    mBlockedSites = nsnull;
+
     BOOL gotPref;
     BOOL pluginsEnabled = [[PreferenceManager sharedInstance] getBooleanPref:"chimera.enable_plugins" withSuccess:&gotPref];
     if (gotPref && !pluginsEnabled)
@@ -149,6 +150,8 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
   [mTitle release];
   [mTabTitle release];
   
+  NS_IF_RELEASE(mBlockedSites);
+  
   [super dealloc];
 }
 
@@ -255,6 +258,9 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
         selector:@selector(offlineModeChanged:)
         name:kOfflineNotificationName
         object:nil];
+
+  // update the blocked popup indicator
+  [mWindowController showPopupBlocked:(mBlockedSites != nil)];
         
   // Update the URL bar, but only if the user hasn't put something of their
   // own in there.
@@ -336,6 +342,9 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
   mLoadingStatusString = [NSLocalizedString(@"TabLoading", @"") retain];
   [mStatus setStringValue:mLoadingStatusString];
 
+  NS_IF_RELEASE(mBlockedSites);
+  [mWindowController showPopupBlocked:NO];
+  
   mProgress = 0.0;
   mIsBusy = YES;
   
@@ -574,6 +583,23 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
   [mToolTip closeToolTip];
 }
 
+//
+// - onPopupBlocked:fromSite:
+//
+// Called when gecko blocks a popup, telling us who it came from. Currently, we
+// don't do anything with the blocked URI, but we have it just in case.
+//
+- (void)onPopupBlocked:(nsIURI*)inURIBlocked fromSite:(nsIURI*)inSite
+{
+  // lazily instantiate.
+  if ( !mBlockedSites )
+    NS_NewISupportsArray(&mBlockedSites);
+  if ( mBlockedSites ) {
+    mBlockedSites->AppendElement(inSite);
+    [mWindowController showPopupBlocked:YES];
+  }
+}
+
 // Called when a context menu should be shown.
 - (void)onShowContextMenu:(int)flags domEvent:(nsIDOMEvent*)aEvent domNode:(nsIDOMNode*)aNode
 {
@@ -857,5 +883,12 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
   return [[self getBrowserView] currentCharset];
 }
 
+- (void)getBlockedSites:(nsISupportsArray**)outSites
+{
+  if ( !outSites )
+    return;
+  *outSites = mBlockedSites;
+  NS_IF_ADDREF(*outSites);
+}
 
 @end
diff --git a/camino/src/browser/KeychainService.mm b/camino/src/browser/KeychainService.mm
index 781d73ebc66b..438286a75894 100644
--- a/camino/src/browser/KeychainService.mm
+++ b/camino/src/browser/KeychainService.mm
@@ -1023,6 +1023,10 @@ KeychainFormSubmitObserver::CheckChangeDataYN(nsIDOMWindowInternal* window)
 {
 }
 
+- (void)onPopupBlocked:(nsIURI*)inURIBlocked fromSite:(nsIURI*)inSite
+{
+}
+
 @end
 
 //
diff --git a/camino/src/embedding/CHBrowserListener.h b/camino/src/embedding/CHBrowserListener.h
index 80950778e3b1..3c2b6dd7821b 100644
--- a/camino/src/embedding/CHBrowserListener.h
+++ b/camino/src/embedding/CHBrowserListener.h
@@ -17,6 +17,7 @@
 #include "nsIWebProgressListener.h"
 #include "nsIEmbeddingSiteWindow2.h"
 #include "nsIWindowCreator.h"
+#include "nsIDOMEventListener.h"
 
 #include "nsIContextMenuListener.h"
 #include "nsITooltipListener.h"
@@ -30,6 +31,7 @@ class CHBrowserListener : public nsSupportsWeakReference,
                                public nsIEmbeddingSiteWindow2,
                                public nsIWebProgressListener,
                                public nsIContextMenuListener,
+                               public nsIDOMEventListener,
                                public nsITooltipListener
 {
 public:
@@ -45,6 +47,7 @@ public:
   NS_DECL_NSIWEBPROGRESSLISTENER
   NS_DECL_NSICONTEXTMENULISTENER
   NS_DECL_NSITOOLTIPLISTENER
+  NS_DECL_NSIDOMEVENTLISTENER
     
   void AddListener(id <CHBrowserListener> aListener);
   void RemoveListener(id <CHBrowserListener> aListener);
diff --git a/camino/src/embedding/CHBrowserListener.mm b/camino/src/embedding/CHBrowserListener.mm
index 5d3fcab3b789..2c2cd1b73c62 100644
--- a/camino/src/embedding/CHBrowserListener.mm
+++ b/camino/src/embedding/CHBrowserListener.mm
@@ -50,6 +50,7 @@
 #include "nsCRT.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
+#include "nsIDOMPopupBlockedEvent.h"
 
 #import "CHBrowserView.h"
 
@@ -70,7 +71,7 @@ CHBrowserListener::~CHBrowserListener()
   [mContainer release];
 }
 
-NS_IMPL_ISUPPORTS9(CHBrowserListener,
+NS_IMPL_ISUPPORTS10(CHBrowserListener,
                    nsIInterfaceRequestor,
                    nsIWebBrowserChrome,
                    nsIWindowCreator,
@@ -79,6 +80,7 @@ NS_IMPL_ISUPPORTS9(CHBrowserListener,
                    nsIWebProgressListener,
                    nsISupportsWeakReference,
                    nsIContextMenuListener,
+                   nsIDOMEventListener,
                    nsITooltipListener)
 
 // Implementation of nsIInterfaceRequestor
@@ -326,9 +328,6 @@ CHBrowserListener::SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 c
   {
     NSRect frame = [window frame];
     
-    float newWidth  = (float)cx;
-    float newHeight = (float)cy;
-    
     // should we allow resizes larger than the screen, or smaller
     // than some min size here?
     
@@ -626,3 +625,16 @@ CHBrowserListener::SetContainer(id <CHBrowserContainer> aContainer)
   [mContainer retain];
 }
 
+NS_IMETHODIMP
+CHBrowserListener::HandleEvent(nsIDOMEvent *event)
+{
+  nsCOMPtr<nsIDOMPopupBlockedEvent> blockEvent = do_QueryInterface(event);
+  if ( blockEvent ) {
+    nsCOMPtr<nsIURI> blockedURI, blockedSite;
+    blockEvent->GetPopupWindowURI(getter_AddRefs(blockedURI));
+    blockEvent->GetRequestingWindowURI(getter_AddRefs(blockedSite));
+    [mContainer onPopupBlocked:blockedURI fromSite:blockedSite];
+  }
+  return NS_OK;
+}
+
diff --git a/camino/src/embedding/CHBrowserView.h b/camino/src/embedding/CHBrowserView.h
index cffe24d2a49f..ede73d37b606 100644
--- a/camino/src/embedding/CHBrowserView.h
+++ b/camino/src/embedding/CHBrowserView.h
@@ -51,6 +51,7 @@ class nsIWebBrowserFind;
 class nsIEventSink;
 class nsIDragHelperService;
 class nsIPrintSettings;
+class nsIURI;
 
 
 // Protocol implemented by anyone interested in progress
@@ -73,7 +74,8 @@ class nsIPrintSettings;
 // Called when a tooltip should be shown or hidden
 - (void)onShowTooltip:(NSPoint)where withText:(NSString*)text;
 - (void)onHideTooltip;
-
+// Called when a popup is blocked
+- (void)onPopupBlocked:(nsIURI*)inURIBlocked fromSite:(nsIURI*)inSite;
 @end
 
 typedef enum {
diff --git a/camino/src/embedding/CHBrowserView.mm b/camino/src/embedding/CHBrowserView.mm
index 58a4e150b0ac..7804870e93c4 100644
--- a/camino/src/embedding/CHBrowserView.mm
+++ b/camino/src/embedding/CHBrowserView.mm
@@ -177,6 +177,12 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
     nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(chromeHandler));
     if ( rec )
       rec->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener));
+    
+    // register the CHBrowserListener as an event listener for popup-blocking events
+    nsCOMPtr<nsIDOMEventTarget> eventTarget = do_QueryInterface(rec);
+    if ( eventTarget )
+      rv = eventTarget->AddEventListener(NS_LITERAL_STRING("DOMPopupBlocked"), 
+                                          NS_STATIC_CAST(nsIDOMEventListener*, _listener), PR_FALSE);
   }
   return self;
 }