Mac: Fix infobar anchor under Harmony.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm

 // Copyright (c) 2011 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/ui/cocoa/location_bar/autocomplete_text_field.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 270 matching lines @@
     return observer_->SelectionRangeForProposedRange(newRange);
   return newRange;
 }
 
 - (void)addToolTip:(NSString*)tooltip forRect:(NSRect)aRect {
   [currentToolTips_ addObject:tooltip];
   [self addToolTipRect:aRect owner:tooltip userData:nil];
 }
 
 - (NSPoint)bubblePointForDecoration:(LocationBarDecoration*)decoration {
-  NSPoint point;
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
-    // Under MD, dialogs have no arrow and anchor to corner of the decoration
-    // frame, not a specific point within it. See http://crbug.com/566115.
-    BOOL isLeftDecoration;
-    const NSRect frame =
-        [[self cell] backgroundFrameForDecoration:decoration
-                                          inFrame:[self bounds]
-                                 isLeftDecoration:&isLeftDecoration];
-    point.y = NSMaxY(frame);
-    point.x = isLeftDecoration ? NSMinX(frame) : NSMaxX(frame);
-  } else {
-    const NSRect frame =
-        [[self cell] frameForDecoration:decoration inFrame:[self bounds]];
-    point = decoration->GetBubblePointInFrame(frame);
-  }
+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial())
+    return [self arrowAnchorPointForDecoration:decoration];
 
+  // Under MD, dialogs have no arrow and anchor to corner of the decoration
+  // frame, not a specific point within it. See http://crbug.com/566115.
+  BOOL isLeftDecoration;
+  const NSRect frame =
+      [[self cell] backgroundFrameForDecoration:decoration
+                                        inFrame:[self bounds]
+                               isLeftDecoration:&isLeftDecoration];
+  NSPoint point = NSMakePoint(isLeftDecoration ? NSMinX(frame) : NSMaxX(frame),
+                              NSMaxY(frame));
   return [self convertPoint:point toView:nil];
 }
 
+- (NSPoint)arrowAnchorPointForDecoration:(LocationBarDecoration*)decoration {
+  const NSRect frame =
+      [[self cell] frameForDecoration:decoration inFrame:[self bounds]];
+  NSPoint point = decoration->GetBubblePointInFrame(frame);
+  return [self convertPoint:point toView:nil];
+}
+
 // TODO(shess): -resetFieldEditorFrameIfNeeded is the place where
 // changes to the cell layout should be flushed.  LocationBarViewMac
 // and ToolbarController are calling this routine directly, and I
 // think they are probably wrong.
 // http://crbug.com/40053
 - (void)updateMouseTracking {
   // This will force |resetCursorRects| to be called, as it is not to be called
   // directly.
   [[self window] invalidateCursorRectsForView:self];
 
@@ skipping 222 matching lines @@
 // ThemedWindowDrawing implementation.
 
 - (void)windowDidChangeTheme {
   [self updateColorsToMatchTheme];
 }
 
 - (void)windowDidChangeActive {
 }
 
 @end