Fixing bug 331331, Change popup blocker's color, a=smokey, r=smorgan, sr=smfr.

camino/Camino.xcode/project.pbxproj

@@ -4598,7 +4598,6 @@
 				3F44AC6805BDFB9E00CB4B08,
 				3F44AC6905BDFB9E00CB4B08,
 				3F44AC6A05BDFB9E00CB4B08,
-				3F44AC6B05BDFB9E00CB4B08,
 				3F44AC6E05BDFB9E00CB4B08,
 				3F44AC6F05BDFB9E00CB4B08,
 				3F44AC7005BDFB9E00CB4B08,
@@ -4719,6 +4718,11 @@
 				DE74F7650AB2618200FD1D5B,
 				DE8C61FF0AB67CDA00078871,
 				DEDDE22E0ABFB21A00D415F2,
+				DE09CD780ACB97C5008A8D9C,
+				DE09CD790ACB97C5008A8D9C,
+				DE09CD7A0ACB97C5008A8D9C,
+				DE09CD7B0ACB97C5008A8D9C,
+				DE09CD7C0ACB97C5008A8D9C,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -5029,12 +5033,6 @@
 			settings = {
 			};
 		};
-		3F44AC6B05BDFB9E00CB4B08 = {
-			fileRef = 3FAD95540461E43700A80005;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		3F44AC6D05BDFB9E00CB4B08 = {
 			fileRef = 3FB2BAE50545EBAB002B9691;
 			isa = PBXBuildFile;
@@ -8519,7 +8517,6 @@
 				3F44AEA105BDFBA000CB4B08,
 				3F44AEA205BDFBA000CB4B08,
 				3F44AEA305BDFBA000CB4B08,
-				3F44AEA405BDFBA000CB4B08,
 				3F44AEA705BDFBA000CB4B08,
 				3F44AEA805BDFBA000CB4B08,
 				3F44AEA905BDFBA000CB4B08,
@@ -8644,6 +8641,11 @@
 				DE74F7630AB2612700FD1D5B,
 				DE74F7660AB2618200FD1D5B,
 				DE8C62000AB67CDA00078871,
+				DE09CD730ACB97C5008A8D9C,
+				DE09CD740ACB97C5008A8D9C,
+				DE09CD750ACB97C5008A8D9C,
+				DE09CD760ACB97C5008A8D9C,
+				DE09CD770ACB97C5008A8D9C,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8954,12 +8956,6 @@
 			settings = {
 			};
 		};
-		3F44AEA405BDFBA000CB4B08 = {
-			fileRef = 3FAD95540461E43700A80005;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		3F44AEA605BDFBA000CB4B08 = {
 			fileRef = 3FB2BAE50545EBAB002B9691;
 			isa = PBXBuildFile;
@@ -11196,14 +11192,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		3FAD95540461E43700A80005 = {
-			isa = PBXFileReference;
-			lastKnownFileType = image.png;
-			name = "popup-blocked.png";
-			path = "resources/images/chrome/popup-blocked.png";
-			refType = 2;
-			sourceTree = SOURCE_ROOT;
-		};
 		3FB2BA7D0545EA80002B9691 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -14020,6 +14008,106 @@
 //DE2
 //DE3
 //DE4
+		DE09CD6E0ACB97C5008A8D9C = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.tiff;
+			name = popup_close.tif;
+			path = resources/images/chrome/popup_close.tif;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		DE09CD6F0ACB97C5008A8D9C = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.tiff;
+			name = popup_close_pressed.tif;
+			path = resources/images/chrome/popup_close_pressed.tif;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		DE09CD700ACB97C5008A8D9C = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.tiff;
+			name = popup_blocked_background.tif;
+			path = resources/images/chrome/popup_blocked_background.tif;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		DE09CD710ACB97C5008A8D9C = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.tiff;
+			name = popup_blocked_icon.tif;
+			path = resources/images/chrome/popup_blocked_icon.tif;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		DE09CD720ACB97C5008A8D9C = {
+			isa = PBXFileReference;
+			lastKnownFileType = image.tiff;
+			name = popup_close_hover.tif;
+			path = resources/images/chrome/popup_close_hover.tif;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		DE09CD730ACB97C5008A8D9C = {
+			fileRef = DE09CD6E0ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD740ACB97C5008A8D9C = {
+			fileRef = DE09CD6F0ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD750ACB97C5008A8D9C = {
+			fileRef = DE09CD700ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD760ACB97C5008A8D9C = {
+			fileRef = DE09CD710ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD770ACB97C5008A8D9C = {
+			fileRef = DE09CD720ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD780ACB97C5008A8D9C = {
+			fileRef = DE09CD6E0ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD790ACB97C5008A8D9C = {
+			fileRef = DE09CD6F0ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD7A0ACB97C5008A8D9C = {
+			fileRef = DE09CD700ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD7B0ACB97C5008A8D9C = {
+			fileRef = DE09CD710ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DE09CD7C0ACB97C5008A8D9C = {
+			fileRef = DE09CD720ACB97C5008A8D9C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		DE74F7470AB25E7D00FD1D5B = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -14924,7 +15012,6 @@
 				0FCD888A08C52A9900A1923B,
 				0FE772B908C7FF4100AFB850,
 				0F2453D508C96478001C264F,
-				3FAD95540461E43700A80005,
 				F5A112C902DF270F01026D5D,
 				F55B6BF402EF1F7E01026D5D,
 				3003B89C044514B600B85BF3,
@@ -14956,6 +15043,11 @@
 				0FE7703708C799BB00AFB850,
 				0FEA7E640926BFC600B06154,
 				DE74F7640AB2618200FD1D5B,
+				DE09CD700ACB97C5008A8D9C,
+				DE09CD710ACB97C5008A8D9C,
+				DE09CD6E0ACB97C5008A8D9C,
+				DE09CD720ACB97C5008A8D9C,
+				DE09CD6F0ACB97C5008A8D9C,
 			);
 			isa = PBXGroup;
 			name = images;

camino/src/browser/BrowserWrapper.h

@@ -249,11 +249,14 @@ class nsIArray;
 
 
 //
-// interface InformationPanel
+// interface InformationPanelView
 //
 // A placard-style view for showing additional information to the user. Drawn
 // with a colored background and bottom shadow.
 //
 
-@interface InformationPanel : NSView
+@interface InformationPanelView : NSView
+{
+  NSImage* mPopupBlockedBackgroundImage;
+}
 @end

camino/src/browser/BrowserWrapper.mm

@@ -37,6 +37,7 @@
 
 #import "NSString+Utils.h"
 #import "NSView+Utils.h"
+#import "ImageAdditions.h"
 
 #import "PreferenceManager.h"
 #import "BrowserWrapper.h"
@@ -518,9 +519,9 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
   if ([self popupsBlocked] && !mBlockedPopupView) {
     [NSBundle loadNibNamed:@"PopupBlockView" owner:self];
 
-    [mBlockedPopupCloseButton setImage:[NSImage imageNamed:@"tab_close"]];
-    [mBlockedPopupCloseButton setAlternateImage:[NSImage imageNamed:@"tab_close_pressed"]];
-    [mBlockedPopupCloseButton setHoverImage:[NSImage imageNamed:@"tab_close_hover"]];
+    [mBlockedPopupCloseButton setImage:[NSImage imageNamed:@"popup_close"]];
+    [mBlockedPopupCloseButton setAlternateImage:[NSImage imageNamed:@"popup_close_pressed"]];
+    [mBlockedPopupCloseButton setHoverImage:[NSImage imageNamed:@"popup_close_hover"]];
 
     [self addSubview:mBlockedPopupView];
     [self setFrame:[self frame] resizingBrowserViewIfHidden:YES];
@@ -1135,7 +1136,15 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
 
 #pragma mark -
 
-@implementation InformationPanel
+@implementation InformationPanelView
+
+- (id)initWithFrame:(NSRect)frameRect
+{
+  if ((self = [super initWithFrame:frameRect]))
+    mPopupBlockedBackgroundImage = [[NSImage imageNamed:@"popup_blocked_background"] retain];
+  
+  return self;
+}
 
 //
 // -drawRect:
@@ -1144,16 +1153,19 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
 //
 - (void)drawRect:(NSRect)aRect
 {
-  // draw background color
-  [[NSColor colorWithCalibratedRed:1.0 green:0.9 blue:0.58 alpha:1.0] set];
-  NSRectFill([self frame]);
+  NSPoint patternOrigin = [self convertPoint:NSMakePoint(0.0f, 0.0f) toView:nil];
+  [mPopupBlockedBackgroundImage drawTiledInRect:aRect
+                                         origin:patternOrigin
+                                      operation:NSCompositeCopy];
   
-  // draw shadowed border
-  [[NSColor controlShadowColor] set];
-  NSRectFill(NSMakeRect(aRect.origin.x, 0.0, aRect.size.width, 1.0));
-
   // Call our base class method to paint contents
-  [super drawRect: aRect];
+  [super drawRect:aRect];
+}
+
+- (void)dealloc
+{
+  [mPopupBlockedBackgroundImage release];
+  [super dealloc];
 }
 
 @end