[omnibox] Home cursor, then restore, on revert

components/omnibox/browser/omnibox_edit_model.cc

 // Copyright 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 "components/omnibox/browser/omnibox_edit_model.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 352 matching lines @@
 }
 
 void OmniboxEditModel::Revert() {
   SetInputInProgress(false);
   input_.Clear();
   paste_state_ = NONE;
   InternalSetUserText(base::string16());
   keyword_.clear();
   is_keyword_hint_ = false;
   has_temporary_text_ = false;
-  view_->SetWindowTextAndCaretPos(permanent_text_,
-                                  has_focus() ? permanent_text_.length() : 0,
-                                  false, true);
+  size_t start, end;
+  view_->GetSelectionBounds(&start, &end);
+  view_->SetWindowTextAndCaretPos(permanent_text_, 0, false, false);
+  view_->SetWindowTextAndCaretPos(
+      permanent_text_, std::min(permanent_text_.length(), start), false, true);
   client_->OnRevert();
 }
 
 void OmniboxEditModel::StartAutocomplete(bool has_selected_text,
                                          bool prevent_inline_autocomplete) {
   const base::string16 input_text = MaybePrependKeyword(user_text_);
 
   size_t start, cursor_position;
   view_->GetSelectionBounds(&start, &cursor_position);
 
@@ skipping 1000 matching lines @@
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 
   client_->OnFocusChanged(focus_state_, reason);
 }