Merge 161515 - Fix omnibox suggestion: restore selection on WM_IME_ENDCOMPOSITION

chrome/browser/ui/views/omnibox/omnibox_view_win.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_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 1397 matching lines @@
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
   LRESULT result = DefWindowProc(message, wparam, lparam);
   // Force an IME composition confirmation operation to trigger the text_changed
   // code in OnAfterPossibleChange(), even if identical contents are confirmed,
   // to make sure the model can update its internal states correctly.
   OnAfterPossibleChangeInternal((lparam & GCS_RESULTSTR) != 0);
   return result;
 }
 
+
+LRESULT OmniboxViewWin::OnImeEndComposition(UINT message, WPARAM wparam,
+                                            LPARAM lparam) {
+  // The edit control auto-clears the selection on WM_IME_ENDCOMPOSITION, which
+  // means any inline autocompletion we were showing will no longer be
+  // selected, and therefore no longer replaced by further user typing.  To
+  // avoid this we manually restore the original selection after the edit
+  // handles the message.
+  CHARRANGE range;
+  GetSel(range);
+  LRESULT result = DefWindowProc(message, wparam, lparam);
+  SetSel(range);
+  return result;
+}
+
 LRESULT OmniboxViewWin::OnImeNotify(UINT message,
                                     WPARAM wparam,
                                     LPARAM lparam) {
   // Close the popup when the IME composition window is open, so they don't
   // overlap.
   switch (wparam) {
     case IMN_OPENCANDIDATE:
       ime_candidate_window_open_ = true;
       CloseOmniboxPopup();
       break;
@@ skipping 1238 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }