Merge 54767 - [Mac] M6 Omnibox positioning changes....

chrome/browser/cocoa/location_bar/page_action_decoration.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.
 
+#include <cmath>
+
 #import "chrome/browser/cocoa/location_bar/page_action_decoration.h"
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "skia/ext/skia_utils_mac.h"
 
+namespace {
+
+// Distance to offset the bubble pointer from the bottom of the max
+// icon area of the decoration.  This makes the popup's upper border
+// 2px away from the omnibox's lower border (matches omnibox popup
+// upper border).
+const CGFloat kBubblePointYOffset = 2.0;
+
+}  // namespace
+
 PageActionDecoration::PageActionDecoration(
     LocationBarViewMac* owner,
     Profile* profile,
     ExtensionAction* page_action)
     : owner_(owner),
       profile_(profile),
       page_action_(page_action),
       tracker_(this),
       current_tab_id_(-1),
       preview_enabled_(false) {
@@ skipping 15 matching lines @@
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
       Source<Profile>(profile_));
 }
 
 PageActionDecoration::~PageActionDecoration() {
 }
 
-// Overridden from LocationBarImageView. Either notify listeners or show a
-// popup depending on the Page Action.
+// Always |kPageActionIconMaxSize| wide.  |ImageDecoration| draws the
+// image centered.
+CGFloat PageActionDecoration::GetWidthForSpace(CGFloat width) {
+  return Extension::kPageActionIconMaxSize;
+}
+
+// Either notify listeners or show a popup depending on the Page
+// Action.
 bool PageActionDecoration::OnMousePressed(NSRect frame) {
   if (current_tab_id_ < 0) {
     NOTREACHED() << "No current tab.";
     // We don't want other code to try and handle this click.  Returning true
     // prevents this by indicating that we handled it.
     return true;
   }
 
   if (page_action_->HasPopup(current_tab_id_)) {
     // Anchor popup at the bottom center of the page action icon.
@@ skipping 102 matching lines @@
 
 void PageActionDecoration::SetToolTip(std::string tooltip) {
   SetToolTip(tooltip.empty() ? nil : base::SysUTF8ToNSString(tooltip));
 }
 
 NSString* PageActionDecoration::GetToolTip() {
   return tooltip_.get();
 }
 
 NSPoint PageActionDecoration::GetBubblePointInFrame(NSRect frame) {
-  frame = GetDrawRectInFrame(frame);
-  return NSMakePoint(NSMidX(frame), NSMaxY(frame));
+  // This is similar to |ImageDecoration::GetDrawRectInFrame()|,
+  // except that code centers the image, which can differ in size
+  // between actions.  This centers the maximum image size, so the
+  // point will consistently be at the same y position.  x position is
+  // easier (the middle of the centered image is the middle of the
+  // frame).
+  const CGFloat delta_height =
+      NSHeight(frame) - Extension::kPageActionIconMaxSize;
+  const CGFloat bottom_inset = std::ceil(delta_height / 2.0);
+
+  // Return a point just below the bottom of the maximal drawing area.
+  return NSMakePoint(NSMidX(frame),
+                     NSMaxY(frame) - bottom_inset + kBubblePointYOffset);
 }
 
 NSMenu* PageActionDecoration::GetMenu() {
   if (!profile_)
     return nil;
   ExtensionsService* service = profile_->GetExtensionsService();
   if (!service)
     return nil;
   Extension* extension = service->GetExtensionById(
       page_action_->extension_id(), false);
@@ skipping 16 matching lines @@
       if (popup && ![popup isClosing])
         [popup close];
 
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }