[Mac] Restore menu position for buttons after Material Design changes.

chrome/browser/ui/cocoa/menu_button.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/menu_button.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/clickhold_button_cell.h"
+#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
+#include "ui/base/material_design/material_design_controller.h"
 #import "ui/base/cocoa/nsview_additions.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 @interface MenuButton (Private)
 - (void)showMenu:(BOOL)isDragging;
 - (void)clickShowMenu:(id)sender;
 - (void)dragShowMenu:(id)sender;
 @end  // @interface MenuButton (Private)
 
 @implementation MenuButton
 
 @synthesize openMenuOnClick = openMenuOnClick_;
@@ skipping 130 matching lines @@
 
   // TODO(viettrungluu): We have some fudge factors below to make things line up
   // (approximately). I wish I knew how to get rid of them. (Note that our view
   // is flipped, and that frame should be in our coordinates.) The y/height is
   // very odd, since it doesn't seem to respond to changes the way that it
   // should. I don't understand it.
   NSRect frame = [self menuRect];
   frame.origin.x -= 2.0;
   frame.size.height -= 19.0 - NSHeight(frame);
 
+  // The button's icon has a different relationship to its bounds in
+  // Material Design, so have to adjust the menu location by that delta.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    frame.origin.x -= [ToolbarController materialDesignButtonInset];
+    frame.origin.y += [ToolbarController materialDesignButtonInset];
+  }
+
   // Make our pop-up button cell and set things up. This is, as of 10.5, the
   // official Apple-recommended hack. Later, perhaps |-[NSMenu
   // popUpMenuPositioningItem:atLocation:inView:]| may be a better option.
   // However, using a pulldown has the benefit that Cocoa automatically places
   // the menu correctly even when we're at the edge of the screen (including
   // "dragging upwards" when the button is close to the bottom of the screen).
   // A |scoped_nsobject| local variable cannot be used here because
   // Accessibility on 10.5 grabs the NSPopUpButtonCell without retaining it, and
   // uses it later. (This is fixed in 10.6.)
   if (!popUpCell_.get()) {
@@ skipping 25 matching lines @@
 }
 
 // Called when the button is clicked and dragged/held.
 - (void)dragShowMenu:(id)sender {
   // We shouldn't get here unless the menu is enabled.
   DCHECK([self attachedMenu]);
   [self showMenu:YES];
 }
 
 @end  // @implementation MenuButton (Private)