[omnibox] Narrow condition for resetting selection

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 754 matching lines @@
     location_bar_view_->Layout();
 }
 
 void OmniboxViewViews::OnBlur() {
   // 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
-  // of running but hasn't yet opened the popup, it will be halted.
-  if (!model()->user_input_in_progress() && model()->popup_model()->IsOpen())
+  // If ZeroSuggest is active, and there is evidence that there is a text
+  // update to show, revert to ensure that update is shown now.  Otherwise,
+  // make sure to call CloseOmniboxPopup() unconditionally, so that if
+  // ZeroSuggest is in the midst of running but hasn't yet opened the popup,
+  // it will be halted.

[Peter Kasting, 2017/04/10 23:04:13]

Nit: Maybe something in this comment should talk about why we don't just call
RevertAll() in all cases.

[Kevin Bailey, 2017/04/11 14:12:41]

It seems to me that number the cases of calling RevertAll() has reduced. What
did you have in mind?

[Peter Kasting, 2017/04/11 20:04:39]

Right.  My point is that, to a reader, it's not immediately obvious why there's
a conditional here.  The comment currently says _what_ the conditional is
checking and the effect of the revert is, but not why it would have been unsafe
to simply write:

  RevertAll();

...with no conditional check.  So I'd describe the negative side effects that
would occur if we were to call RevertAll() outside of the cases where we
currently do.

[Kevin Bailey, 2017/04/12 14:57:03]

There are a dozen things that revert does additionally, so I hope I covered
the one you were thinking of.

+  if (!model()->user_input_in_progress() && model()->popup_model()->IsOpen() &&
+      text() != model()->PermanentText())
     RevertAll();
   else
     CloseOmniboxPopup();
 
   // Tell the model to reset itself.
   model()->OnKillFocus();
 
   // Make sure the beginning of the text is visible.
   SelectRange(gfx::Range(0));
 
@@ skipping 267 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);
 }