Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.h

Issue 11093044: Fix omnibox suggestion: restore selection on WM_IME_ENDCOMPOSITION (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address comments Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 // CWindowImpl 145 // CWindowImpl
146 BEGIN_MSG_MAP(OmniboxViewWin) 146 BEGIN_MSG_MAP(OmniboxViewWin)
147 MSG_WM_CHAR(OnChar) 147 MSG_WM_CHAR(OnChar)
148 MSG_WM_CONTEXTMENU(OnContextMenu) 148 MSG_WM_CONTEXTMENU(OnContextMenu)
149 MSG_WM_COPY(OnCopy) 149 MSG_WM_COPY(OnCopy)
150 MSG_WM_CREATE(OnCreate) 150 MSG_WM_CREATE(OnCreate)
151 MSG_WM_CUT(OnCut) 151 MSG_WM_CUT(OnCut)
152 MESSAGE_HANDLER_EX(WM_GETOBJECT, OnGetObject) 152 MESSAGE_HANDLER_EX(WM_GETOBJECT, OnGetObject)
153 MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition) 153 MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition)
154 MESSAGE_HANDLER_EX(WM_IME_ENDCOMPOSITION, OnImeEndComposition)
154 MESSAGE_HANDLER_EX(WM_IME_NOTIFY, OnImeNotify) 155 MESSAGE_HANDLER_EX(WM_IME_NOTIFY, OnImeNotify)
155 MESSAGE_HANDLER_EX(WM_POINTERDOWN, OnPointerDown) 156 MESSAGE_HANDLER_EX(WM_POINTERDOWN, OnPointerDown)
156 MESSAGE_HANDLER_EX(WM_POINTERUP, OnPointerUp) 157 MESSAGE_HANDLER_EX(WM_POINTERUP, OnPointerUp)
157 MSG_WM_KEYDOWN(OnKeyDown) 158 MSG_WM_KEYDOWN(OnKeyDown)
158 MSG_WM_KEYUP(OnKeyUp) 159 MSG_WM_KEYUP(OnKeyUp)
159 MSG_WM_KILLFOCUS(OnKillFocus) 160 MSG_WM_KILLFOCUS(OnKillFocus)
160 MSG_WM_LBUTTONDBLCLK(OnLButtonDblClk) 161 MSG_WM_LBUTTONDBLCLK(OnLButtonDblClk)
161 MSG_WM_LBUTTONDOWN(OnLButtonDown) 162 MSG_WM_LBUTTONDOWN(OnLButtonDown)
162 MSG_WM_LBUTTONUP(OnLButtonUp) 163 MSG_WM_LBUTTONUP(OnLButtonUp)
163 MSG_WM_MBUTTONDBLCLK(OnMButtonDblClk) 164 MSG_WM_MBUTTONDBLCLK(OnMButtonDblClk)
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 static bool SchemeEnd(LPTSTR edit_text, int current_pos, int length); 244 static bool SchemeEnd(LPTSTR edit_text, int current_pos, int length);
244 245
245 // Message handlers 246 // Message handlers
246 void OnChar(TCHAR ch, UINT repeat_count, UINT flags); 247 void OnChar(TCHAR ch, UINT repeat_count, UINT flags);
247 void OnContextMenu(HWND window, const CPoint& point); 248 void OnContextMenu(HWND window, const CPoint& point);
248 void OnCopy(); 249 void OnCopy();
249 LRESULT OnCreate(const CREATESTRUCTW* create_struct); 250 LRESULT OnCreate(const CREATESTRUCTW* create_struct);
250 void OnCut(); 251 void OnCut();
251 LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam); 252 LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam);
252 LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam); 253 LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam);
254 LRESULT OnImeEndComposition(UINT message, WPARAM wparam, LPARAM lparam);
253 LRESULT OnImeNotify(UINT message, WPARAM wparam, LPARAM lparam); 255 LRESULT OnImeNotify(UINT message, WPARAM wparam, LPARAM lparam);
254 LRESULT OnPointerDown(UINT message, WPARAM wparam, LPARAM lparam); 256 LRESULT OnPointerDown(UINT message, WPARAM wparam, LPARAM lparam);
255 LRESULT OnPointerUp(UINT message, WPARAM wparam, LPARAM lparam); 257 LRESULT OnPointerUp(UINT message, WPARAM wparam, LPARAM lparam);
256 void OnKeyDown(TCHAR key, UINT repeat_count, UINT flags); 258 void OnKeyDown(TCHAR key, UINT repeat_count, UINT flags);
257 void OnKeyUp(TCHAR key, UINT repeat_count, UINT flags); 259 void OnKeyUp(TCHAR key, UINT repeat_count, UINT flags);
258 void OnKillFocus(HWND focus_wnd); 260 void OnKillFocus(HWND focus_wnd);
259 void OnLButtonDblClk(UINT keys, const CPoint& point); 261 void OnLButtonDblClk(UINT keys, const CPoint& point);
260 void OnLButtonDown(UINT keys, const CPoint& point); 262 void OnLButtonDown(UINT keys, const CPoint& point);
261 void OnLButtonUp(UINT keys, const CPoint& point); 263 void OnLButtonUp(UINT keys, const CPoint& point);
262 void OnMButtonDblClk(UINT keys, const CPoint& point); 264 void OnMButtonDblClk(UINT keys, const CPoint& point);
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 // Instance of accessibility information and handling. 510 // Instance of accessibility information and handling.
509 mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_; 511 mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_;
510 512
511 // The native view host. 513 // The native view host.
512 views::NativeViewHost* native_view_host_; 514 views::NativeViewHost* native_view_host_;
513 515
514 DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin); 516 DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
515 }; 517 };
516 518
517 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 519 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698