Adjust ellision strategy for omnibox search chip.

chrome/browser/ui/views/location_bar/location_bar_layout.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_layout.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/view.h"
@@ skipping 110 matching lines @@
     if (decoration->max_fraction > 0.0) {
       int max_width = static_cast<int>(*entry_width * decoration->max_fraction);
       decoration->computed_width = std::min(
           decoration->view->GetPreferredSize().width(),
           std::max(decoration->view->GetMinimumSize().width(), max_width));
       *entry_width -= decoration->computed_width;
     }
   }
 }
 
-void LocationBarLayout::LayoutPass3(gfx::Rect* bounds, int* available_width) {
+void LocationBarLayout::LayoutPass3(gfx::Rect* bounds,
+                                    int* available_width,
+                                    bool allow_collapse) {
   bool first_visible = true;
   for (const auto& decoration : decorations_) {
     // Collapse decorations if needed.
     if (decoration->auto_collapse) {
       int padding = (first_visible ? decoration->edge_item_padding
                                    : decoration->item_padding);
-      // Try preferred size, if it fails try minimum size, if it fails collapse.
+      // Try preferred size and if it fails try minimum size.
       decoration->computed_width = decoration->view->GetPreferredSize().width();
       if (decoration->computed_width + padding > *available_width)
         decoration->computed_width = decoration->view->GetMinimumSize().width();
-      if (decoration->computed_width + padding > *available_width) {
+      // If there's insufficient room for the minimum size of the decoration and
+      // we are allowed to collapse, hide the decoration.
+      if (allow_collapse &&
+          decoration->computed_width + padding > *available_width) {
         decoration->computed_width = 0;
         decoration->view->SetVisible(false);
       } else {
         decoration->view->SetVisible(true);
         (*available_width) -= decoration->computed_width + padding;
       }
     } else {
       decoration->view->SetVisible(true);
     }
 
     // Layout visible decorations.
     if (!decoration->view->visible())
       continue;
     int padding = (first_visible ? decoration->edge_item_padding
                                  : decoration->item_padding);
     first_visible = false;
     int x = (position_ == LEFT_EDGE)
                 ? (bounds->x() + padding)
                 : (bounds->right() - padding - decoration->computed_width);
     decoration->view->SetBounds(x, decoration->y, decoration->computed_width,
                                 decoration->height);
     bounds->set_width(bounds->width() - padding - decoration->computed_width);
     if (position_ == LEFT_EDGE)
       bounds->set_x(bounds->x() + padding + decoration->computed_width);
   }
   bounds->set_width(bounds->width() - item_edit_padding_);
   if (position_ == LEFT_EDGE)
     bounds->set_x(bounds->x() + item_edit_padding_);
 }