Merge 32461 - Mac: Fix regression in NTP detached bookmark bar colours....

chrome/browser/cocoa/bookmark_bar_toolbar_view.mm

Index: chrome/browser/cocoa/bookmark_bar_toolbar_view.mm
===================================================================
--- chrome/browser/cocoa/bookmark_bar_toolbar_view.mm	(revision 32517)
+++ chrome/browser/cocoa/bookmark_bar_toolbar_view.mm	(working copy)
@@ -98,7 +98,8 @@
     toolbarColor = nil;
   if (!toolbarColor)
     toolbarColor = [NSColor colorWithCalibratedWhite:0.9 alpha:1.0];
-  [[toolbarColor colorWithAlphaComponent:morph] set];  // Set with opacity.
+  CGFloat alpha = morph * [toolbarColor alphaComponent];
+  [[toolbarColor colorWithAlphaComponent:alpha] set];  // Set with opacity.
   [border fill];
 
   // Fade in/out the background.
@@ -116,13 +117,16 @@
   NSColor* borderColor =
       [[self gtm_theme] strokeColorForStyle:GTMThemeStyleToolBarButton
                                       state:GTMThemeStateActiveWindow];
-  [[borderColor colorWithAlphaComponent:morph] set];  // Set with opacity.
+  alpha = morph * [borderColor alphaComponent];
+  [[borderColor colorWithAlphaComponent:alpha] set];  // Set with opacity.
   [border stroke];
 
   // Fade in/out the divider.
   // TODO(viettrungluu): It's not obvious that this divider lines up exactly
   // with |BackgroundGradientView|'s (in fact, it probably doesn't).
-  [[[self strokeColor] colorWithAlphaComponent:(1 - morph)] set];
+  NSColor* strokeColor = [self strokeColor];
+  alpha = (1 - morph) * [strokeColor alphaComponent];
+  [[strokeColor colorWithAlphaComponent:alpha] set];
   NSBezierPath* divider = [NSBezierPath bezierPath];
   NSPoint dividerStart =
       NSMakePoint(morph * bookmarks::kNTPBookmarkBarPadding + morph * 0.5,