Adjust ellision strategy for omnibox search chip.

chrome/browser/ui/views/location_bar/location_bar_view.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_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 557 matching lines @@
 
   // Perform layout.
   int full_width = width() - (2 * edge_thickness);
 
   int entry_width = full_width;
   leading_decorations.LayoutPass1(&entry_width);
   trailing_decorations.LayoutPass1(&entry_width);
   leading_decorations.LayoutPass2(&entry_width);
   trailing_decorations.LayoutPass2(&entry_width);
 
-  int location_needed_width = omnibox_view_->GetTextWidth();
-  int available_width = entry_width - location_needed_width;
+  int location_desired_width = omnibox_view_->GetTextWidth();
+  int available_width = entry_width - location_desired_width;
   // The bounds must be wide enough for all the decorations to fit.
   gfx::Rect location_bounds(edge_thickness, vertical_padding,
                             std::max(full_width, full_width - entry_width),
                             location_height);
-  leading_decorations.LayoutPass3(&location_bounds, &available_width);
-  trailing_decorations.LayoutPass3(&location_bounds, &available_width);
+  leading_decorations.LayoutPass3(&location_bounds, &available_width, false);
+  trailing_decorations.LayoutPass3(&location_bounds, &available_width, true);
 
   // Layout |ime_inline_autocomplete_view_| next to the user input.
   if (ime_inline_autocomplete_view_->visible()) {
     int width =
         gfx::GetStringWidth(ime_inline_autocomplete_view_->text(),
                             ime_inline_autocomplete_view_->font_list()) +
         ime_inline_autocomplete_view_->GetInsets().width();
     // All the target languages (IMEs) are LTR, and we do not need to support
     // RTL so far.  In other words, no testable RTL environment so far.
-    int x = location_needed_width;
+    int x = location_desired_width;
     if (width > entry_width)
       x = 0;
-    else if (location_needed_width + width > entry_width)
+    else if (location_desired_width + width > entry_width)
       x = entry_width - width;
     location_bounds.set_width(x);
     ime_inline_autocomplete_view_->SetBounds(
         location_bounds.right(), location_bounds.y(),
         std::min(width, entry_width), location_bounds.height());
   }
   omnibox_view_->SetBoundsRect(location_bounds);
 }
 
+bool LocationBarView::OnMousePressed(const ui::MouseEvent& event) {
+  return static_cast<views::View*>(omnibox_view_)->OnMousePressed(event);

[Peter Kasting, 2017/02/25 06:17:11]

I don't like forwarding these.  It seems strange given that clicks on the
location icon text don't result in selecting the omnibox text.

[Evan Stade, 2017/03/07 18:10:22]

well the location icon is usually a security indicator, and clicking it does do
something rather than nothing (as clicking on search currently does nothing). I
think this feels nice but I'll split it off into a separate cl and discussion.

+}
+
+void LocationBarView::OnMouseReleased(const ui::MouseEvent& event) {
+  static_cast<views::View*>(omnibox_view_)->OnMouseReleased(event);
+}
+
 void LocationBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   RefreshLocationIcon();
   if (is_popup_mode_) {
     set_background(
         views::Background::CreateSolidBackground(GetColor(BACKGROUND)));
   } else {
     // This border color will be blended on top of the toolbar (which may use an
     // image in the case of themes).
     set_background(
         new BackgroundWith1PxBorder(GetColor(BACKGROUND), GetBorderColor()));
@@ skipping 589 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }