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 459 matching lines @@
       font_(parent_view->font()),
       possible_drag_(false),
       in_drag_(false),
       initiated_drag_(false),
       drop_highlight_position_(-1),
       ime_candidate_window_open_(false),
       background_color_(skia::SkColorToCOLORREF(LocationBarView::GetColor(
           chrome::search::IsInstantExtendedAPIEnabled(parent_view_->profile()),
           ToolbarModel::NONE, LocationBarView::BACKGROUND))),
       security_level_(ToolbarModel::NONE),
-      text_object_model_(NULL) {
+      text_object_model_(NULL),
+      in_on_ime_composition_(false) {
   if (!loaded_library_module_)
     loaded_library_module_ = LoadLibrary(kRichEditDLLName);
 
   saved_selection_for_focus_change_.cpMin = -1;
 
   g_paint_patcher.Pointer()->RefPatch();
 
   Create(location_bar->GetWidget()->GetNativeView(), 0, 0, 0,
          l10n_util::GetExtendedStyles());
   SetReadOnly(popup_window_mode_);
@@ skipping 253 matching lines @@
     return;
   }
 
   // Don't inline autocomplete when:
   //   * The user is deleting text
   //   * The caret/selection isn't at the end of the text
   //   * The user has just pasted in something that replaced all the text
   //   * The user is trying to compose something in an IME
   CHARRANGE sel;
   GetSel(sel);
+  bool prevent_inline_auto_completion =

[falken, 2012/10/10 09:51:33]

nit: I think this can just be prevent_inline_autocompletion. Also in the
comments, autocompletion can be one word. 

[Seigo Nonaka, 2012/10/10 10:18:22]

Done.

+      (sel.cpMax < GetTextLength()) || IsImeComposing();
+
+  // SetSel doesn't work when the TSF based text input modules such as CJK
+  // on-screen keyboards on Windows 8 insert a character and then CUAS

[falken, 2012/10/10 09:51:33]

I think the CUAS acronym isn't widely known. Consider writing "CUAS (Cicero
Unaware Application Support)".

[Seigo Nonaka, 2012/10/10 10:18:22]

Done.

+  // translates it into IMM32 protocol like WM_IME_COMPOSITION. As a result,

[falken, 2012/10/10 09:51:33]

"into an IMM32 protocol message"

[Seigo Nonaka, 2012/10/10 10:18:22]

Done.

+  // auto-completed text will not be updated as expected. To workaround this
+  // issue, temporary disable auto-completion during WM_IME_COMPOSITION iff
+  // Windows 8.
+  // TODO(nona): Re-enable auto-completion for Korean, where this issue is not
+  // reproducible for some reasons.
+  // TODO(nona): Remove this workaround after fixing crbug.com/154379.
+  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+    prevent_inline_auto_completion |= in_on_ime_composition_;
   model()->StartAutocomplete(sel.cpMax != sel.cpMin,
-                            (sel.cpMax < GetTextLength()) || IsImeComposing());
+                             prevent_inline_auto_completion);
 }
 
 void OmniboxViewWin::SetFocus() {
   ::SetFocus(m_hWnd);
 }
 
 void OmniboxViewWin::SetDropHighlightPosition(int position) {
   if (drop_highlight_position_ != position) {
     RepaintDropHighlight(drop_highlight_position_);
     drop_highlight_position_ = position;
@@ skipping 635 matching lines @@
     // This message was sent while we're in the middle of meddling with the
     // underlying edit control.  If we handle it below, OnAfterPossibleChange()
     // can get bogus text for the edit, and rerun autocomplete, destructively
     // modifying the result set that we're in the midst of using.  For example,
     // if SetWindowTextAndCaretPos() was called due to the user clicking an
     // entry in the popup, we're in the middle of executing SetSelectedLine(),
     // and changing the results can cause checkfailures.
     return DefWindowProc(message, wparam, lparam);
   }
 
+  in_on_ime_composition_ = true;
   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);
+  in_on_ime_composition_ = false;
   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:
@@ skipping 1251 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();
 }