Revert of [Mac][Material Design] Bring bookmark hover state, etc. up to spec.

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.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/bookmarks/bookmark_button_cell.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h"
 #include "chrome/grit/generated_resources.h"
 #import "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/user_metrics.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 const int kHierarchyButtonXMargin = 4;
 const int kIconTextSpacer = 4;
-const int kTextRightPadding = 1;
-const int kIconLeftPadding = 1;
+const int kTextRightPadding = 3;
+const int kIconLeftPadding = 3;
 
 const int kDefaultFontSize = 12;
 
 };  // namespace
 
 @interface BookmarkButtonCell(Private)
 - (void)configureBookmarkButtonCell;
 - (void)applyTextColor;
 // Returns the title the button cell displays. Note that a button cell can
 // have a title string assigned but it won't be visible if its image position
@@ skipping 283 matching lines @@
     // Return the space needed to display the image and title, with a little
     // distance between them.
     cellSize = NSMakeSize(kIconLeftPadding + [[self image] size].width,
                           bookmarks::kBookmarkButtonHeight);
     NSString* title = [self visibleTitle];
     if ([title length] > 0) {
       CGFloat textWidth =
           [title sizeWithAttributes:[self titleTextAttributes]].width;
       cellSize.width +=
           kIconTextSpacer + std::ceil(textWidth) + kTextRightPadding;
-    } else {
-      // Make buttons without visible titles 20pts wide (18 plus padding).
-      cellSize.width = 18;
     }
   }
 
   if (drawFolderArrow_) {
     cellSize.width += [arrowImage_ size].width + 2 * kHierarchyButtonXMargin;
   }
   return cellSize;
 }
 
 - (NSRect)imageRectForBounds:(NSRect)theRect {
   NSRect imageRect = [super imageRectForBounds:theRect];
   // In Material Design, add a little space between the image and the button's
   // left edge, but only if there's a visible title.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     imageRect.origin.y -= 1;
-    imageRect.origin.x += kIconLeftPadding;
+    if ([[self visibleTitle] length]) {
+      imageRect.origin.x += kIconLeftPadding;
+    }
   }
   return imageRect;
 }
 
 - (CGFloat)textStartXOffset {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [super textStartXOffset];
   }
   return kIconLeftPadding + [[self image] size].width + kIconTextSpacer;
 }
@@ skipping 39 matching lines @@
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
       ![self isFolderButtonCell] && kLineWidth < 1) {
     return -kLineWidth;
   }
   return 0.0;
 }
 
 
 @end