Merge 34145 - Reverts my r4300 and refixes Issue 3156 and 13500....

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2009 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/autocomplete/autocomplete_edit_view_win.h"
 
 #include <locale>
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 598 matching lines @@
   model_->SetUserText(text);
   saved_selection_for_focus_change_.cpMin = -1;
   SetWindowTextAndCaretPos(display_text, display_text.length());
   if (update_popup)
     UpdatePopup();
   TextChanged();
 }
 
 void AutocompleteEditViewWin::SetWindowTextAndCaretPos(const std::wstring& text,
                                                        size_t caret_pos) {
-  HIMC imm_context = ImmGetContext(m_hWnd);
-  if (imm_context) {
-    // In Windows Vista, SetWindowText() automatically cancels any ongoing
-    // IME composition, and updates the text of the underlying edit control.
-    // In Windows XP, however, SetWindowText() gets applied to the IME
-    // composition string if it exists, and doesn't update the underlying edit
-    // control. To avoid this, we force the IME to cancel any outstanding
-    // compositions here.  This is harmless in Vista and in cases where the IME
-    // isn't composing.
-
-    // NOTE: We MUST ignore messages like WM_IME_COMPOSITION that may be sent as
-    // a result of doing this.  Until the SetWindowText() call below, the
-    // underlying edit (on XP) has out-of-date text in it; for problems this can
-    // cause, see OnImeComposition().
-    ignore_ime_messages_ = true;
-    ImmNotifyIME(imm_context, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
-    ImmReleaseContext(m_hWnd, imm_context);
-    ignore_ime_messages_ = false;
-  }
-
   SetWindowText(text.c_str());
   PlaceCaretAt(caret_pos);
 }
 
 void AutocompleteEditViewWin::SetForcedQuery() {
   const std::wstring current_text(GetText());
   if (current_text.empty() || (current_text[0] != '?'))
     SetUserText(L"?");
   else
     SetSelection(current_text.length(), 1);
@@ skipping 146 matching lines @@
     size_t user_text_length) {
   // Update the text and selection.  Because this can be called repeatedly while
   // typing, we've careful not to freeze the edit unless we really need to.
   // Also, unlike in the temporary text case above, here we don't want to update
   // the caret/selection unless we have to, since this might make the user's
   // caret position change without warning during typing.
   if (display_text == GetText())
     return false;
 
   ScopedFreeze freeze(this, GetTextObjectModel());
-  // NOTE: We don't need the IME composition hack in SetWindowTextAndCaretPos()
-  // here, because UpdatePopup() disables inline autocomplete when a
-  // composition is in progress, thus preventing us from reaching this code.
   SetWindowText(display_text.c_str());
   // Set a reversed selection to keep the caret in the same position, which
   // avoids scrolling the user's text.
   SetSelection(static_cast<LONG>(display_text.length()),
                static_cast<LONG>(user_text_length));
   TextChanged();
   return true;
 }
 
 void AutocompleteEditViewWin::OnRevertTemporaryText() {
@@ skipping 892 matching lines @@
 
   // Restore saved selection if available.
   if (saved_selection_for_focus_change_.cpMin != -1) {
     SetSelectionRange(saved_selection_for_focus_change_);
     saved_selection_for_focus_change_.cpMin = -1;
   }
 
   SetMsgHandled(false);
 }
 
+LRESULT AutocompleteEditViewWin::OnSetText(const wchar_t* text) {
+  // Ignore all IME messages while we process this WM_SETTEXT message.
+  // When SetWindowText() is called while an IME is composing text, the IME
+  // calls SendMessage() to send a WM_IME_COMPOSITION message. When we receive
+  // this WM_IME_COMPOSITION message, we update the omnibox and may call
+  // SetWindowText() again. To stop this recursive message-handler call, we
+  // stop updating the omnibox while we process a WM_SETTEXT message.
+  // We wouldn't need to do this update anyway, because either we're in the
+  // middle of updating the omnibox already or the caller of SetWindowText()
+  // is going to update the omnibox next.
+  AutoReset auto_reset_ignore_ime_messages(&ignore_ime_messages_, true);
+  return DefWindowProc(WM_SETTEXT, 0, reinterpret_cast<LPARAM>(text));
+}
+
 void AutocompleteEditViewWin::OnSysChar(TCHAR ch,
                                         UINT repeat_count,
                                         UINT flags) {
   // Nearly all alt-<xxx> combos result in beeping rather than doing something
   // useful, so we discard most.  Exceptions:
   //   * ctrl-alt-<xxx>, which is sometimes important, generates WM_CHAR instead
   //     of WM_SYSCHAR, so it doesn't need to be handled here.
   //   * alt-space gets translated by the default WM_SYSCHAR handler to a
   //     WM_SYSCOMMAND to open the application context menu, so we need to allow
   //     it through.
@@ skipping 701 matching lines @@
     context_menu_contents_->AddItemWithStringId(IDS_PASTE_AND_GO,
                                                 IDS_PASTE_AND_GO);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_SELECT_ALL, IDS_SELECT_ALL);
     context_menu_contents_->AddSeparator();
     context_menu_contents_->AddItemWithStringId(IDS_EDIT_SEARCH_ENGINES,
                                                 IDS_EDIT_SEARCH_ENGINES);
   }
   context_menu_.reset(new views::Menu2(context_menu_contents_.get()));
 }