[Mac][Material Design] Adjust bookmark spacing and folder menu drawing.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
index c9e3c795554c881d7dcc580376031022cfb57ba5..c582670c2428179260ef7ac36fcde17f9bdd5c53 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
@@ -9,9 +9,18 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 using bookmarks::kBookmarkBarMenuCornerRadius;
 
+namespace {
+
+// Material Design bookmark folder window background white.
+const CGFloat kMDFolderWindowBackgroundColor = 237. / 255.;
+
+}  // namespace
+

[tapted, 2016/08/09 02:52:03]

nit: remove extra blank line

(also technically the anonymous namespace is redundant, since `const` also gives
internal linkage, but opinions differ - I don't think this is consistently
applied)

[shrike, 2016/08/09 16:28:50]

Done. And I will leave the namespace as is.

+
 @implementation BookmarkBarFolderWindow
 
 - (id)initWithContentRect:(NSRect)contentRect
@@ -45,26 +54,39 @@ using bookmarks::kBookmarkBarMenuCornerRadius;
 
 @implementation BookmarkBarFolderWindowContentView
 
++ (NSColor*)backgroundColor {
+  DCHECK(ui::MaterialDesignController::IsModeMaterial());
+  static NSColor* backgroundColor =
+      [[NSColor colorWithGenericGamma22White:kMDFolderWindowBackgroundColor
+                                       alpha:1.0] retain];
+  return backgroundColor;
+}
+
 - (void)drawRect:(NSRect)rect {
   // Like NSMenus, only the bottom corners are rounded.
   NSBezierPath* bezier =
       [NSBezierPath bezierPathWithRoundedRect:[self bounds]
                                       xRadius:kBookmarkBarMenuCornerRadius
                                       yRadius:kBookmarkBarMenuCornerRadius];
-  NSColor* startColor = [NSColor colorWithCalibratedWhite:0.91 alpha:1.0];
-  NSColor* midColor =
-      [startColor gtm_colorAdjustedFor:GTMColorationLightMidtone faded:YES];
-  NSColor* endColor =
-      [startColor gtm_colorAdjustedFor:GTMColorationLightPenumbra faded:YES];
-
-  base::scoped_nsobject<NSGradient> gradient(
-      [[NSGradient alloc] initWithColorsAndLocations:startColor, 0.0,
-                                                     midColor, 0.25,
-                                                     endColor, 0.5,
-                                                     midColor, 0.75,
-                                                     startColor, 1.0,
-                                                     nil]);
-  [gradient drawInBezierPath:bezier angle:0.0];
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    [[BookmarkBarFolderWindowContentView backgroundColor] set];
+    [bezier fill];
+  } else {
+    NSColor* startColor = [NSColor colorWithCalibratedWhite:0.91 alpha:1.0];
+    NSColor* midColor =
+        [startColor gtm_colorAdjustedFor:GTMColorationLightMidtone faded:YES];
+    NSColor* endColor =
+        [startColor gtm_colorAdjustedFor:GTMColorationLightPenumbra faded:YES];
+
+    base::scoped_nsobject<NSGradient> gradient(
+        [[NSGradient alloc] initWithColorsAndLocations:startColor, 0.0,
+                                                       midColor, 0.25,
+                                                       endColor, 0.5,
+                                                       midColor, 0.75,
+                                                       startColor, 1.0,
+                                                       nil]);
+    [gradient drawInBezierPath:bezier angle:0.0];
+  }
 }
 
 @end