Omnibox: Preserve display text and select all on a focus search

components/omnibox/browser/omnibox_edit_model.cc

Index: components/omnibox/browser/omnibox_edit_model.cc
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
index a20b4a8f0791917444cee9256fb95c18f77f2344..05ad3d2088b8ad41262efcb4facd8410fb11a3d7 100644
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -560,6 +560,7 @@ void OmniboxEditModel::EnterKeywordModeForDefaultSearchProvider(
     KeywordModeEntryMethod entry_method) {
   autocomplete_controller()->Stop(false);
 
+  user_text_ = user_input_in_progress_ ? view_->GetText() : base::string16();
   user_input_in_progress_ = true;

[Tom (Use chromium acct), 2016/10/20 20:34:54]

Should this be SetInputInProgress(true)?

[Peter Kasting, 2016/10/20 21:42:00]

Yes, I think so.

You should consider using SetUserText() in place of these two lines.  This would
also allow deleting "is_keyword_hint_ = false;" below.  I would double-check
that that doesn't do anything you explicitly don't want.

   keyword_ = client_->GetTemplateURLService()->
       GetDefaultSearchProvider()->keyword();