Fix bubble offset issue (bubble x-coordinate pointing to wrong place) on OS X...

chrome/browser/cocoa/location_bar/location_bar_view_mac.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 "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/stl_util-inl.h"
@@ skipping 40 matching lines @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/net_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
-// Horizontal space between the right edge of the |location_icon_decoration_|
-// and the first run bubble arrow point.
-const static int kFirstRunBubbleXOffset = 4;
-
 // Vertical space between the bottom edge of the location_bar and the first run
 // bubble arrow point.
 const static int kFirstRunBubbleYOffset = 1;
 
 }
 
 // TODO(shess): This code is mostly copied from the gtk
 // implementation.  Make sure it's all appropriate and flesh it out.
 
 LocationBarViewMac::LocationBarViewMac(
@@ skipping 46 matching lines @@
   Task* task = first_run_bubble_.NewRunnableMethod(
       &LocationBarViewMac::ShowFirstRunBubbleInternal, bubble_type);
   MessageLoop::current()->PostTask(FROM_HERE, task);
 }
 
 void LocationBarViewMac::ShowFirstRunBubbleInternal(
     FirstRun::BubbleType bubble_type) {
   if (!field_ || ![field_ window])
     return;
 
-  // The bubble needs to be just below the Omnibox and slightly to the right
-  // of the left omnibox icon, so shift x and y co-ordinates.
-  const NSPoint kOffset = GetFirstRunBubblePoint();
+  // The first run bubble's left edge should line up with the left edge of the
+  // omnibox. This is different from other bubbles, which line up at a point
+  // set by their top arrow. Because the BaseBubbleController adjusts the
+  // window origin left to account for the arrow spacing, the first run bubble
+  // moves the window origin right by this spacing, so that the
+  // BaseBubbleController will move it back to the correct position.
+  const NSPoint kOffset = NSMakePoint(
+      info_bubble::kBubbleArrowXOffset + info_bubble::kBubbleArrowWidth/2.0,
+      kFirstRunBubbleYOffset);
   [FirstRunBubbleController showForView:field_ offset:kOffset profile:profile_];
 }
 
 std::wstring LocationBarViewMac::GetInputString() const {
   return location_input_;
 }
 
 void LocationBarViewMac::SetSuggestedText(const string16& text) {
   // TODO(rohitrao): implement me.  http://crbug.com/56385
 }
@@ skipping 354 matching lines @@
   } else {
     const NSRect frame =
         [cell frameForDecoration:location_icon_decoration_.get()
                          inFrame:[field_ bounds]];
     const NSPoint point =
         location_icon_decoration_->GetBubblePointInFrame(frame);
     return [field_ convertPoint:point toView:nil];
   }
 }
 
-NSPoint LocationBarViewMac::GetFirstRunBubblePoint() const {
-  AutocompleteTextFieldCell* cell = [field_ cell];
-  const NSRect frame =
-      [cell frameForDecoration:location_icon_decoration_.get()
-                       inFrame:[field_ bounds]];
-  return NSMakePoint(
-      NSMaxX(frame) + kFirstRunBubbleXOffset,
-      kFirstRunBubbleYOffset);
-}
-
 NSImage* LocationBarViewMac::GetKeywordImage(const std::wstring& keyword) {
   const TemplateURL* template_url =
       profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
   if (template_url && template_url->IsExtensionKeyword()) {
     const SkBitmap& bitmap = profile_->GetExtensionsService()->
         GetOmniboxIcon(template_url->GetExtensionId());
     return gfx::SkBitmapToNSImage(bitmap);
   }
 
   return AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
@@ skipping 147 matching lines @@
 
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ updateCursorAndToolTipRects];
 
   [field_ setNeedsDisplay:YES];
 }