Always use ELIDE_TAIL for bookmarks-bar buttons

This keeps bookmarks-bar entries more aligned with Windows style.

Bug: chromium:870158
Change-Id: I7a9e5a147cd9c12a1a5c5de58b40dfdd4c8eb0c9
Reviewed-on: https://chromium-review.googlesource.com/c/1284052Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601224}

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -142,13 +142,6 @@ static const int kBookmarkBarAppsShortcutButtonTag = 2;
 
 namespace {
 
-// How to elide bookmark and bookmark folders.
-gfx::ElideBehavior GetElideBehavior() {
-  return views::PlatformStyle::kShouldElideBookmarksInBookmarksBar
-             ? gfx::ELIDE_TAIL
-             : gfx::FADE_TAIL;
-}
-
 // To enable/disable BookmarkBar animations during testing. In production
 // animations are enabled by default.
 bool animations_enabled = true;
@@ -193,7 +186,6 @@ class BookmarkButtonBase : public views::LabelButton {
       : LabelButton(listener, title) {
     SetImageLabelSpacing(ChromeLayoutProvider::Get()->GetDistanceMetric(
         DISTANCE_RELATED_LABEL_HORIZONTAL_LIST));
-    SetElideBehavior(GetElideBehavior());
     SetInkDropMode(InkDropMode::ON);
     set_has_ink_drop_action_on_click(true);
     set_ink_drop_visible_opacity(kToolbarInkDropVisibleOpacity);
@@ -381,7 +373,6 @@ class BookmarkFolderButton : public BookmarkMenuButtonBase {
                        views::MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
       : BookmarkMenuButtonBase(title, menu_button_listener, show_menu_marker) {
-    SetElideBehavior(GetElideBehavior());
     show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating

ui/views/style/platform_style.cc

@@ -61,7 +61,6 @@ const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = false;
 const bool PlatformStyle::kUseRipples = true;
 const bool PlatformStyle::kTextfieldScrollsToStartOnFocusChange = false;
 const bool PlatformStyle::kTextfieldUsesDragCursorWhenDraggable = true;
-const bool PlatformStyle::kShouldElideBookmarksInBookmarksBar = false;
 const bool PlatformStyle::kPreferFocusRings = false;
 const bool PlatformStyle::kInactiveWidgetControlsAppearDisabled = false;
 

ui/views/style/platform_style.h

@@ -70,10 +70,6 @@ class VIEWS_EXPORT PlatformStyle {
   // dragging but available to do so.
   static const bool kTextfieldUsesDragCursorWhenDraggable;
 
-  // Whether bookmarks in the bookmarks bar are elided [and show elipses at the
-  // tail] or fade out.
-  static const bool kShouldElideBookmarksInBookmarksBar;
-
   // The thickness and inset amount of focus ring halos.
   static const float kFocusHaloThickness;
   static const float kFocusHaloInset;

ui/views/style/platform_style_mac.mm

@@ -40,7 +40,6 @@ const bool PlatformStyle::kSelectAllOnRightClickWhenUnfocused = true;
 const bool PlatformStyle::kTextfieldScrollsToStartOnFocusChange = true;
 const bool PlatformStyle::kTextfieldUsesDragCursorWhenDraggable = false;
 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true;
-const bool PlatformStyle::kShouldElideBookmarksInBookmarksBar = true;
 const bool PlatformStyle::kUseRipples = false;
 const bool PlatformStyle::kPreferFocusRings = true;
 const bool PlatformStyle::kInactiveWidgetControlsAppearDisabled = true;