Merge 20395 - Fix a crash when clicking a popup entry while composing in the ...

chrome/browser/autocomplete/autocomplete_edit_view_win.h

Index: chrome/browser/autocomplete/autocomplete_edit_view_win.h
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit_view_win.h	(revision 20692)
+++ chrome/browser/autocomplete/autocomplete_edit_view_win.h	(working copy)
@@ -420,6 +420,10 @@
   // unnecessary event.  See detailed comments in OnMouseMove().
   bool can_discard_mousemove_;
 
+  // Used to prevent IME message handling in the midst of updating the edit
+  // text.  See comments where this is used.
+  bool ignore_ime_messages_;
+
   // Variables for tracking state before and after a possible change.
   std::wstring text_before_change_;
   CHARRANGE sel_before_change_;
Property changes on: chrome\browser\autocomplete\autocomplete_edit_view_win.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/autocomplete/autocomplete_edit_view_win.h:r69-2775
   Merged /trunk/src/chrome/browser/autocomplete/autocomplete_edit_view_win.h:r20395