Pretty-up the blocked popup view by sharing code from the status bubble. Bloc...

chrome/browser/cocoa/blocked_popup_container_controller.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #import "chrome/browser/cocoa/blocked_popup_container_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/sys_string_conversions.h"
+#import "chrome/browser/cocoa/bubble_view.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "grit/generated_resources.h"
 
-#import "chrome/browser/cocoa/background_gradient_view.h"
-
 // A C++ bridge class that manages the interaction between the C++ interface
 // and the Objective-C view controller that implements the popup blocker.
 class BlockedPopupContainerViewBridge : public BlockedPopupContainerView {
  public:
   BlockedPopupContainerViewBridge(BlockedPopupContainerController* controller);
   virtual ~BlockedPopupContainerViewBridge();
 
   // Overrides from BlockedPopupContainerView
   virtual void SetPosition();
   virtual void ShowView();
@@ skipping 17 matching lines @@
 - (id)initWithContainer:(BlockedPopupContainer*)container {
   if ((self = [super init])) {
     container_ = container;
     bridge_.reset(new BlockedPopupContainerViewBridge(self));
     [self initPopupView];
   }
   return self;
 }
 
 - (void)dealloc {
+  [closeButton_ removeTrackingArea:closeTrackingArea_.get()];
   [view_ removeFromSuperview];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (IBAction)closePopup:(id)sender {
   container_->set_dismissed();
   container_->CloseAll();
 }
 
 // Create and initialize the popup view and its label, close box, etc.
 - (void)initPopupView {
   static const float kWidth = 200.0;
   static const float kHeight = 20.0;
   static const float kCloseBoxSize = 16.0;
   static const float kCloseBoxPaddingY = 2.0;
   static const float kLabelPaddingX = 5.0;
 
+  NSWindow* window = [[self containingView] window];
+
   // Create it below the parent's bottom edge so we can animate it into place.
   NSRect startFrame = NSMakeRect(0.0, -kHeight, kWidth, kHeight);
-  view_.reset([[BackgroundGradientView alloc] initWithFrame:startFrame]);
+  view_.reset([[BubbleView alloc] initWithFrame:startFrame
+                                  themeProvider:window]);
   [view_ setAutoresizingMask:NSViewMinXMargin | NSViewMaxYMargin];
+  [view_ setCornerFlags:kRoundedTopLeftCorner | kRoundedTopRightCorner];
 
   // Create the text label and position it. We'll resize it later when the
   // label gets updated. The view owns the label, we only hold a weak reference.
   NSRect labelFrame = NSMakeRect(kLabelPaddingX,
                                  0,
                                  startFrame.size.width - kCloseBoxSize,
                                  startFrame.size.height);
   popupButton_ = [[[NSPopUpButton alloc] initWithFrame:labelFrame] autorelease];
   [popupButton_ setAutoresizingMask:NSViewWidthSizable];
   [popupButton_ setBordered:NO];
   [popupButton_ setBezelStyle:NSTexturedRoundedBezelStyle];
   [popupButton_ setPullsDown:YES];
   // TODO(pinkerton): this doesn't work, not sure why.
   [popupButton_ setPreferredEdge:NSMaxYEdge];
   // TODO(pinkerton): no matter what, the arrows always draw in the middle
   // of the button. We can turn off the arrows entirely, but then will the
-  // user ever know to click it? Leave them on for now.
-  //[[popupButton_ cell] setArrowPosition:NSPopUpNoArrow];
+  // user ever know to click it?
+  [[popupButton_ cell] setArrowPosition:NSPopUpNoArrow];
   [[popupButton_ cell] setAltersStateOfSelectedItem:NO];
   // If we don't add this, no title will ever display.
   [popupButton_ addItemWithTitle:@"placeholder"];
   [view_ addSubview:popupButton_];
 
   // Register for notifications that the menu is about to display so we can
   // fill it in lazily
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(showMenu:)
              name:NSPopUpButtonCellWillPopUpNotification
            object:[popupButton_ cell]];
 
   // Create the close box and position at the left of the view.
   NSRect closeFrame = NSMakeRect(startFrame.size.width - kCloseBoxSize,
                                  kCloseBoxPaddingY,
                                  kCloseBoxSize,
                                  kCloseBoxSize);
-  NSButton* close = [[[NSButton alloc] initWithFrame:closeFrame] autorelease];
-  [close setAutoresizingMask:NSViewMinXMargin];
-  [close setImage:nsimage_cache::ImageNamed(@"close_bar.pdf")];
-  [close setAlternateImage:nsimage_cache::ImageNamed(@"close_bar_p.pdf")];
-  [close setBordered:NO];
-  [close setTarget:self];
-  [close setAction:@selector(closePopup:)];
-  [view_ addSubview:close];
+  closeButton_.reset([[NSButton alloc] initWithFrame:closeFrame]);
+  [closeButton_ setAutoresizingMask:NSViewMinXMargin];
+  [closeButton_ setButtonType:NSMomentaryChangeButton];
+  [closeButton_ setImage:nsimage_cache::ImageNamed(@"close_bar.pdf")];
+  [closeButton_ setAlternateImage:nsimage_cache::ImageNamed(@"close_bar_p.pdf")];

[rohitrao (ping after 24h), 2009/09/08 19:25:21]

Line too long.

[pink (ping after 24hrs), 2009/09/08 19:50:17]

Done.

+  [closeButton_ setBordered:NO];
+  [closeButton_ setTarget:self];
+  [closeButton_ setAction:@selector(closePopup:)];
+  [view_ addSubview:closeButton_];
+
+  // Set up the tracking rect for the close button mouseover.  Add it
+  // to the |closeButton_| view, but we'll handle the message ourself.
+  // The mouseover is always enabled, because the close button works
+  // regardless of key/main/active status.
+  closeTrackingArea_.reset(
+      [[NSTrackingArea alloc] initWithRect:[closeButton_ bounds]
+                                   options:NSTrackingMouseEnteredAndExited |
+                                           NSTrackingActiveAlways
+                                     owner:self
+                                  userInfo:nil]);
+  [closeButton_ addTrackingArea:closeTrackingArea_.get()];
 }
 
 // Returns the C++ brige object.
 - (BlockedPopupContainerView*)bridge {
   return bridge_.get();
 }
 
 // Returns the parent of the RWHVMac. We insert our popup blocker as a sibling
 // so that it stays around as the RWHVMac is created/destroyed during
 // navigation.
 - (NSView*)containingView {
-  return container_->GetConstrainingContents(NULL)->view()->GetNativeView();
+  NSView* view = nil;
+  if (container_)
+    view = container_->GetConstrainingContents(NULL)->view()->GetNativeView();
+  return view;
 }
 
 - (void)show {
   const float kLeftPadding = 20;  // Leave room for the scrollbar.
 
   // No need to do anything if it's already on screen.
   if ([view_ superview]) return;
 
   // Position the view at the bottom right corner, always leaving room for the
   // scrollbar. This is what window does. It also doesn't care about covering
@@ skipping 37 matching lines @@
   NSString* label = nil;
   if (blockedPopups) {
     label = base::SysUTF16ToNSString(
         l10n_util::GetStringFUTF16(IDS_POPUPS_BLOCKED_COUNT,
                                    UintToString16(blockedPopups)));
   } else {
     label = base::SysUTF16ToNSString(
         l10n_util::GetStringUTF16(IDS_POPUPS_UNBLOCKED));
   }
   [self resizeWithLabel:label];
-  [popupButton_ setTitle:label];
+  [view_ setContent:label];
 }
 
 // Called when the user selects an item from the popup menu. The tag, if below
 // |kImpossibleNumberOfPopups| will be the index into the container's popup
 // array. In that case, we should display the popup. If >=
 // |kImpossibleNumberOfPopups|, it represents a host that we should whitelist.
 // |sender| is the NSMenuItem that was chosen.
 - (void)menuAction:(id)sender {
   size_t tag = static_cast<size_t>([sender tag]);
   if (tag < BlockedPopupContainer::kImpossibleNumberOfPopups) {
@@ skipping 91 matching lines @@
 
 - (NSPopUpButton*)popupButton {
   return popupButton_;
 }
 
 // Only used for testing.
 - (void)setContainer:(BlockedPopupContainer*)container {
   container_ = container;
 }
 
+// Called when the mouse enters the tracking rect for the close box.
+- (void)mouseEntered:(NSEvent *)theEvent {
+  if ([theEvent trackingArea] == closeTrackingArea_)
+    [closeButton_ setImage:nsimage_cache::ImageNamed(@"close_bar_h.pdf")];
+}
+
+// Called when the mouse exits the tracking rect for the close box.
+- (void)mouseExited:(NSEvent *)theEvent {
+  if ([theEvent trackingArea] == closeTrackingArea_)
+    [closeButton_ setImage:nsimage_cache::ImageNamed(@"close_bar.pdf")];
+}
+
 @end
 
 //---------------------------------------------------------------------------
 
 BlockedPopupContainerView* BlockedPopupContainerView::Create(
     BlockedPopupContainer* container) {
   // We "leak" |blocker| for now, we'll release it when the bridge class
   // gets a Destroy() message.
   BlockedPopupContainerController* blocker =
       [[BlockedPopupContainerController alloc] initWithContainer:container];
@@ skipping 21 matching lines @@
   [controller_ update];
 }
 
 void BlockedPopupContainerViewBridge::HideView() {
   [controller_ hide];
 }
 
 void BlockedPopupContainerViewBridge::Destroy() {
   [controller_ autorelease];
 }