[Mac] Adjust browser-action and content-setting popup points

chrome/browser/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2010 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 "browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/nsimage_cache_mac.h"
@@ skipping 39 matching lines @@
 const CGFloat kBrowserActionHeight = 29.0;
 const CGFloat kBrowserActionWidth = 29.0;
 
 // The padding between browser action buttons.
 const CGFloat kBrowserActionButtonPadding = 2.0;
 
 // Padding between Omnibox and first button.  Since the buttons have a
 // pixel of internal padding, this needs an extra pixel.
 const CGFloat kBrowserActionLeftPadding = kBrowserActionButtonPadding + 1.0;
 
+// How far to inset from the bottom of the view to get the top border
+// of the popup 2px below the bottom of the Omnibox.
+const CGFloat kBrowserActionBubbleYOffset = 3.0;
+
 }  // namespace
 
 @interface BrowserActionsController(Private)
 // Used during initialization to create the BrowserActionButton objects from the
 // stored toolbar model.
 - (void)createButtons;
 
 // Creates and then adds the given extension's action button to the container
 // at the given index within the container. It does not affect the toolbar model
 // object since it is called when the toolbar model changes.
@@ skipping 297 matching lines @@
   int savedButtonCount = toolbarModel_->GetVisibleIconCount();
   if (savedButtonCount < 0 ||  // all icons are visible
       static_cast<NSUInteger>(savedButtonCount) > [self buttonCount])
     savedButtonCount = [self buttonCount];
   return [self containerWidthWithButtonCount:savedButtonCount];
 }
 
 - (NSPoint)popupPointForBrowserAction:(Extension*)extension {
   if (!extension->browser_action())
     return NSZeroPoint;
-  BrowserActionButton* button = [self buttonForExtension:extension];
+
+  NSButton* button = [self buttonForExtension:extension];
   if (!button)
     return NSZeroPoint;
 
-  NSView* view = button;
-  BOOL isHidden = [hiddenButtons_ containsObject:button];
-  if (isHidden)
-    view = chevronMenuButton_.get();
+  if ([hiddenButtons_ containsObject:button])
+    button = chevronMenuButton_.get();
 
-  NSPoint arrowPoint = [view frame].origin;
-  // Adjust the anchor point to be at the center of the browser action button
-  // or chevron.
-  arrowPoint.x += NSWidth([view frame]) / 2;
-  // Move the arrow up a bit in the case that it's pointing to the chevron.
-  if (isHidden)
-    arrowPoint.y += NSHeight([view frame]) / 4;
-
-  return [[view superview] convertPoint:arrowPoint toView:nil];
+  // Anchor point just above the center of the bottom.
+  const NSRect bounds = [button bounds];
+  DCHECK([button isFlipped]);

[Bons, 2010/08/03 21:11:49]

isFlipped is deprecated on 10.6 so we don't use it. Is there a reason you need
to DCHECK this?

[Scott Hess - ex-Googler, 2010/08/03 21:22:50]

The -isFlipped of the button affects whether the code below needs NSMaxY() or
NSMinY().  I had initially written it to be neutral WRT flipped
(-convertRect:toView: will unflip the rect as necessary, so convert the rect
before finding the point), but that looked cumbersome, too.  I can pull it back
if you'd like.

-[NSImage isFlipped] is deprecated, not -[NSView isFlipped].

[Bons, 2010/08/03 21:40:36]

Ah you're right. No worries. As needed.

+  NSPoint anchor = NSMakePoint(NSMidX(bounds),
+                               NSMaxY(bounds) - kBrowserActionBubbleYOffset);
+  return [button convertPoint:anchor toView:nil];
 }
 
 - (BOOL)chevronIsHidden {
   if (!chevronMenuButton_.get())
     return YES;
 
   if (![chevronAnimation_ isAnimating])
     return [chevronMenuButton_ isHidden];
 
   DCHECK([[chevronAnimation_ viewAnimations] count] > 0);
@@ skipping 452 matching lines @@
   if (profile_->IsOffTheRecord())
     index = toolbarModel_->IncognitoIndexToOriginal(index);
   if (index < toolbarModel_->size()) {
     Extension* extension = toolbarModel_->GetExtensionByIndex(index);
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end