[Mac] Increase infobar height under Material Design.

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // Copyright (c) 2012 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/infobars/infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "grit/components_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
 
 @interface InfoBarController ()
 // Sets |label_| based on |labelPlaceholder_|, sets |labelPlaceholder_| to nil.
 - (void)initializeLabel;
 @end
 
 @implementation InfoBarController
 
@@ skipping 32 matching lines @@
     labelFrame.size.width += NSMinX(imageFrame) - NSMinX(labelFrame);
     labelFrame.origin.x = imageFrame.origin.x;
     [image_ removeFromSuperview];
     image_ = nil;
     [labelPlaceholder_ setFrame:labelFrame];
   }
   [self initializeLabel];
 
   [self addAdditionalControls];
 
+  // With Material Design infobars are drawn a little taller, so have to move
+  // its controls to keep them centered.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    CGFloat heightDelta = InfoBarContainerDelegate::kDefaultBarTargetHeightMd -
+        InfoBarContainerDelegate::kDefaultBarTargetHeight;
+    for (NSView* nextSubview in [infoBarView_ subviews]) {
+      NSRect frame = [nextSubview frame];
+      frame.origin.y += heightDelta / 2;
+      [nextSubview setFrame:frame];
+    }
+  }

[Avi (use Gerrit), 2016/04/13 21:35:00]

Joy...

It's a race now between the switch to MD and the switch to Views. Are you going
to have to go in and tweak all the nibs when we switch to MD, or will Views hit
first and let you avoid the hassle? :)

+
   [infoBarView_ setInfobarType:[self delegate]->GetInfoBarType()];
   [infoBarView_ setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 }
 
 - (void)dealloc {
   [okButton_ setTarget:nil];
   [cancelButton_ setTarget:nil];
   [closeButton_ setTarget:nil];
   [super dealloc];
 }
@@ skipping 97 matching lines @@
   [newLabel setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];
   [[labelPlaceholder_ superview]
       replaceSubview:labelPlaceholder_ with:newLabel];
   labelPlaceholder_ = nil;  // Now released.
   [newLabel setDelegate:self];
 
   label_.reset(newLabel.release());
 }
 
 @end