[Omnibox] Elide omnibox text

chrome/browser/ui/views/omnibox/omnibox_view_views.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/omnibox/omnibox_view_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 120 matching lines @@
 #endif
 
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
   popup_view_.reset();
 }
 
 void OmniboxViewViews::Init() {
   set_controller(this);
   SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
 

[Peter Kasting, 2017/04/17 19:03:52]

Nit: Blank line here unnecessary

[simonhong, 2017/04/17 19:51:01]

Done.

+  GetRenderText()->SetElideBehavior(gfx::ELIDE_TAIL);
+
   if (popup_window_mode_)
     SetReadOnly(true);
 
   if (location_bar_view_) {
     // Initialize the popup view using the same font.
     popup_view_.reset(OmniboxPopupContentsView::Create(
         GetFontList(), this, model(), location_bar_view_));
   }
 
   // Override the default FocusableBorder from Textfield, since the
@@ skipping 590 matching lines @@
     }
     InsertOrReplaceText(action_data.value);
     TextChanged();
     return true;
   }
 
   return Textfield::HandleAccessibleAction(action_data);
 }
 
 void OmniboxViewViews::OnFocus() {
+  GetRenderText()->SetElideBehavior(gfx::NO_ELIDE);

[Peter Kasting, 2017/04/17 19:03:52]

Nit: Both here and in OnBlur() I'd attempt to call this after calling the
superclass handler, so the pattern is "run superclass handler, then do all local
handling"

[simonhong, 2017/04/17 19:51:01]

Done.

+
   views::Textfield::OnFocus();
   // TODO(oshima): Get control key state.
   model()->OnSetFocus(false);
   // Don't call controller()->OnSetFocus, this view has already acquired focus.
 
   // Restore the selection we saved in OnBlur() if it's still valid.
   if (saved_selection_for_focus_change_.IsValid()) {
     SelectRange(saved_selection_for_focus_change_);
     saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
   }
 
   // Focus changes can affect the visibility of any keyword hint.
   if (model()->is_keyword_hint())
     location_bar_view_->Layout();
 }

[Peter Kasting, 2017/04/17 19:03:53]

Do we need to schedule a paint here or is changing the elide behavior guaranteed
to do that?

[simonhong, 2017/04/17 19:51:01]

It's guaranteed.
When getting text or properties from RenderText, RenderText ensure reflecting
new elide behavior to its text.

 
 void OmniboxViewViews::OnBlur() {
+  GetRenderText()->SetElideBehavior(gfx::ELIDE_TAIL);
+
   // Save the user's existing selection to restore it later.
   saved_selection_for_focus_change_ = GetSelectedRange();
 
   views::Textfield::OnBlur();
   model()->OnWillKillFocus();
 
   // If ZeroSuggest is active, we may have refused to show an update to the
   // underlying permanent URL that happened while the popup was open, so
   // revert to ensure that update is shown now.  Otherwise, make sure to call
   // CloseOmniboxPopup() unconditionally, so that if ZeroSuggest is in the midst
@@ skipping 279 matching lines @@
       paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO);
 
   menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }