Shift omnibox dropdown in and up on Windows, and square off the top, so it co...

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
-#include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/cocoa/event_utils.h"
 #include "gfx/rect.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
 
 namespace {
 
 // The size delta between the font used for the edit and the result
 // rows.
@@ skipping 223 matching lines @@
 
 // Return the currently highlighted row.  Returns -1 if no row is
 // highlighted.
 - (NSInteger)highlightedRow;
 
 @end
 
 AutocompletePopupViewMac::AutocompletePopupViewMac(
     AutocompleteEditViewMac* edit_view,
     AutocompleteEditModel* edit_model,
-    const BubblePositioner* bubble_positioner,
     Profile* profile,
     NSTextField* field)
     : model_(new AutocompletePopupModel(this, edit_model, profile)),
       edit_view_(edit_view),
-      bubble_positioner_(bubble_positioner),
       field_(field),
       popup_(nil) {
   DCHECK(edit_view);
   DCHECK(edit_model);
   DCHECK(profile);
   edit_model->SetPopupModel(model_.get());
 }
 
 AutocompletePopupViewMac::~AutocompletePopupViewMac() {
   // TODO(shess): Having to be aware of destructor ordering in this
@@ skipping 46 matching lines @@
     [matrix setTarget:nil];
 
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
   // Layout the popup and size it to land underneath the field.
-  NSRect r =
-      NSRectFromCGRect(bubble_positioner_->GetLocationStackBounds().ToCGRect());
+  // The field has a single-pixel border on the left and right.  This
+  // needs to be factored out so that the popup window's border (which
+  // is outside the frame) lines up.
+  const int kLocationStackEdgeWidth = 1;
+  NSRect r = NSInsetRect([field_ convertRect:[field_ bounds] toView:nil],
+                         kLocationStackEdgeWidth, 0);
   r.origin = [[field_ window] convertBaseToScreen:r.origin];
   DCHECK_GT(r.size.width, 0.0);
 
   // The popup's font is a slightly smaller version of what |field_|
   // uses.
   NSFont* fieldFont = [field_ font];
   const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
   gfx::Font resultFont = gfx::Font::CreateFont(
       base::SysNSStringToWide([fieldFont fontName]), (int)resultFontSize);
 
@@ skipping 336 matching lines @@
                        bottomRightCornerRadius:0.0];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end