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

chrome/browser/autocomplete/autocomplete_edit_view_win.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 158 matching lines @@
     MSG_WM_MBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_MBUTTONUP(OnNonLButtonUp)
     MSG_WM_MOUSEACTIVATE(OnMouseActivate)
     MSG_WM_MOUSEMOVE(OnMouseMove)
     MSG_WM_MOUSEWHEEL(OnMouseWheel)
     MSG_WM_PAINT(OnPaint)
     MSG_WM_PASTE(OnPaste)
     MSG_WM_RBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_RBUTTONUP(OnNonLButtonUp)
     MSG_WM_SETFOCUS(OnSetFocus)
+    MSG_WM_SETTEXT(OnSetText)
     MSG_WM_SYSCHAR(OnSysChar)  // WM_SYSxxx == WM_xxx with ALT down
     MSG_WM_SYSKEYDOWN(OnKeyDown)
     MSG_WM_SYSKEYUP(OnKeyUp)
     MSG_WM_WINDOWPOSCHANGING(OnWindowPosChanging)
     DEFAULT_REFLECTION_HANDLER()  // avoids black margin area
   END_MSG_MAP()
 
   // SimpleMenuModel::Delegate
   virtual bool IsCommandIdChecked(int command_id) const;
   virtual bool IsCommandIdEnabled(int command_id) const;
@@ skipping 63 matching lines @@
   void OnLButtonDown(UINT keys, const CPoint& point);
   void OnLButtonUp(UINT keys, const CPoint& point);
   LRESULT OnMouseActivate(HWND window, UINT hit_test, UINT mouse_message);
   void OnMouseMove(UINT keys, const CPoint& point);
   BOOL OnMouseWheel(UINT flags, short delta, CPoint point);
   void OnNonLButtonDown(UINT keys, const CPoint& point);
   void OnNonLButtonUp(UINT keys, const CPoint& point);
   void OnPaint(HDC bogus_hdc);
   void OnPaste();
   void OnSetFocus(HWND focus_wnd);
+  LRESULT OnSetText(const wchar_t* text);
   void OnSysChar(TCHAR ch, UINT repeat_count, UINT flags);
   void OnWindowPosChanging(WINDOWPOS* window_pos);
 
   // Helper function for OnChar() and OnKeyDown() that handles keystrokes that
   // could change the text in the edit.
   void HandleKeystroke(UINT message, TCHAR key, UINT repeat_count, UINT flags);
 
   // Helper functions for OnKeyDown() that handle accelerators applicable when
   // we're not read-only and all the time, respectively.  These return true if
   // they handled the key.
@@ skipping 214 matching lines @@
   mutable ScopedComPtr<IAccessible> autocomplete_accessibility_;
 
   // We explicitly retain a handle to this library so it never gets unloaded out
   // from underneath us.
   HMODULE riched20dll_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewWin);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_