| Index: chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.h b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| index 207af0bdbb83ced0277bd10ccf7315ab1784e0c6..5e9ea288eeda01569c100774840a5f2b4075bb67 100644
|
| --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| @@ -186,6 +186,7 @@ class OmniboxViewWin
|
| MSG_WM_CUT(OnCut)
|
| MESSAGE_HANDLER_EX(WM_GETOBJECT, OnGetObject)
|
| MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition)
|
| + MESSAGE_HANDLER_EX(WM_IME_NOTIFY, OnImeNotify)
|
| MSG_WM_KEYDOWN(OnKeyDown)
|
| MSG_WM_KEYUP(OnKeyUp)
|
| MSG_WM_KILLFOCUS(OnKillFocus)
|
| @@ -284,6 +285,7 @@ class OmniboxViewWin
|
| void OnCut();
|
| LRESULT OnGetObject(UINT uMsg, WPARAM wparam, LPARAM lparam);
|
| LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam);
|
| + LRESULT OnImeNotify(UINT message, WPARAM wparam, LPARAM lparam);
|
| void OnKeyDown(TCHAR key, UINT repeat_count, UINT flags);
|
| void OnKeyUp(TCHAR key, UINT repeat_count, UINT flags);
|
| void OnKillFocus(HWND focus_wnd);
|
| @@ -530,6 +532,10 @@ class OmniboxViewWin
|
| // Position of the drop highlight. If this is -1, there is no drop highlight.
|
| int drop_highlight_position_;
|
|
|
| + // True if the IME candidate window is open. When this is true, we want to
|
| + // avoid showing the popup.
|
| + bool ime_candidate_window_open_;
|
| +
|
| // Security UI-related data.
|
| COLORREF background_color_;
|
| ToolbarModel::SecurityLevel security_level_;
|
|
|