Omnibox UI Experiments: Show elided permanent URLs (when flag on)

This CL enables showing the elided permanent URLs when the flag is on.

It also restores the full URL on focus and puts back the elided one on
blur (assuming it hasn't been edited).

No selection adjustment logic exists in this CL.

Bug: 797354
Change-Id: I1fc6a8aa37aaf4582db2b6895a1292006da3114b
Reviewed-on: https://chromium-review.googlesource.com/882617
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532033}

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

@@ -195,8 +195,8 @@ void OmniboxViewViews::OnTabChanged(const content::WebContents* web_contents) {
   UpdateSecurityLevel();
   const OmniboxState* state = static_cast<OmniboxState*>(
       web_contents->GetUserData(&OmniboxState::kKey));
-  model()->RestoreState(controller()->GetToolbarModel()->GetFormattedFullURL(),
-                        state ? &state->model_state : NULL);
+  model()->RestoreState(controller()->GetURLForDisplay(),
+                        state ? &state->model_state : nullptr);
   if (state) {
     // This assumes that the omnibox has already been focused or blurred as
     // appropriate; otherwise, a subsequent OnFocus() or OnBlur() call could
@@ -217,8 +217,8 @@ void OmniboxViewViews::ResetTabState(content::WebContents* web_contents) {
 void OmniboxViewViews::Update() {
   const security_state::SecurityLevel old_security_level = security_level_;
   UpdateSecurityLevel();
-  if (model()->SetPermanentText(
-          controller()->GetToolbarModel()->GetFormattedFullURL())) {
+
+  if (model()->SetPermanentText(controller()->GetURLForDisplay())) {
     RevertAll();
 
     // Only select all when we have focus.  If we don't have focus, selecting
@@ -831,8 +831,7 @@ bool OmniboxViewViews::HandleAccessibleAction(
 
 void OmniboxViewViews::OnFocus() {
   views::Textfield::OnFocus();
-  model()->SetPermanentText(
-      controller()->GetToolbarModel()->GetFormattedFullURL());
+  model()->SetPermanentText(controller()->GetURLForDisplay());
   // TODO(oshima): Get control key state.
   model()->OnSetFocus(false);
   // Don't call controller()->OnSetFocus, this view has already acquired focus.

components/omnibox/browser/omnibox_edit_controller.cc

@@ -4,6 +4,10 @@
 
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 
+#include "base/feature_list.h"
+#include "components/omnibox/browser/omnibox_field_trial.h"
+#include "components/toolbar/toolbar_model.h"
+
 void OmniboxEditController::OnAutocompleteAccept(
     const GURL& destination_url,
     WindowOpenDisposition disposition,
@@ -14,6 +18,13 @@ void OmniboxEditController::OnAutocompleteAccept(
   transition_ = transition;
 }
 
+base::string16 OmniboxEditController::GetURLForDisplay() {
+  return base::FeatureList::IsEnabled(
+             omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains)
+             ? GetToolbarModel()->GetURLForDisplay()
+             : GetToolbarModel()->GetFormattedFullURL();
+}
+
 OmniboxEditController::OmniboxEditController()
     : disposition_(WindowOpenDisposition::CURRENT_TAB),
       transition_(ui::PageTransitionFromInt(

components/omnibox/browser/omnibox_edit_controller.h

@@ -31,6 +31,11 @@ class OmniboxEditController {
   virtual ToolbarModel* GetToolbarModel() = 0;
   virtual const ToolbarModel* GetToolbarModel() const = 0;
 
+  // Returns the text to display in the steady state, when the omnibox does not
+  // have focus. This may be a simplified version of the URL with destructive
+  // elisions applied - and is not suitable for editing.
+  base::string16 GetURLForDisplay();
+
  protected:
   OmniboxEditController();
   virtual ~OmniboxEditController();

components/omnibox/browser/omnibox_edit_model.cc

@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "base/auto_reset.h"
+#include "base/feature_list.h"
 #include "base/format_macros.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
@@ -28,6 +29,7 @@
 #include "components/omnibox/browser/omnibox_client.h"
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 #include "components/omnibox/browser/omnibox_event_global_tracker.h"
+#include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_log.h"
 #include "components/omnibox/browser/omnibox_navigation_observer.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
@@ -37,6 +39,7 @@
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
+#include "components/toolbar/toolbar_model.h"
 #include "components/url_formatter/url_fixer.h"
 #include "third_party/metrics_proto/omnibox_event.pb.h"
 #include "ui/gfx/image/image.h"
@@ -901,6 +904,12 @@ void OmniboxEditModel::OnSetFocus(bool control_down) {
   SetFocusState(OMNIBOX_FOCUS_VISIBLE, OMNIBOX_FOCUS_CHANGE_EXPLICIT);
   control_key_state_ = control_down ? DOWN_WITHOUT_CHANGE : UP;
 
+  if (base::FeatureList::IsEnabled(
+          omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains)) {
+    // Show the full URL if the user focuses the Omnibox.
+    SetPermanentText(controller()->GetToolbarModel()->GetFormattedFullURL());
+  }
+
   // Try to get ZeroSuggest suggestions if a page is loaded and the user has
   // not been typing in the omnibox.  The |user_input_in_progress_| check is
   // used to detect the case where this function is called after right-clicking
@@ -935,6 +944,14 @@ void OmniboxEditModel::SetCaretVisibility(bool visible) {
 void OmniboxEditModel::OnWillKillFocus() {
   if (user_input_in_progress_ || !in_revert_)
     client_->OnInputStateChanged();
+
+  if (!user_input_in_progress_ &&
+      base::FeatureList::IsEnabled(
+          omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains)) {
+    // If the user has not edited the input and is now leaving Omnibox focus,
+    // restore the elided URL as the permanent text.
+    RestoreState(controller()->GetURLForDisplay(), nullptr);
+  }
 }
 
 void OmniboxEditModel::OnKillFocus() {