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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.h

Issue 8268003: Hide autocomplete popup when IME candidate window is open (on Windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: initialize Created 9 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 side-by-side diff with in-line comments
Download patch
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..6d0f91af0354ba7370e8d876a55813610bd8da92 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
@@ -142,6 +142,7 @@ class OmniboxViewWin
virtual int TextWidth() const OVERRIDE;
virtual string16 GetInstantSuggestion() const OVERRIDE;
virtual bool IsImeComposing() const OVERRIDE;
+ virtual bool ShouldHideAutocompletePopup() const OVERRIDE;
virtual views::View* AddToView(views::View* parent) OVERRIDE;
virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
@@ -186,6 +187,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 +286,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 +533,9 @@ 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.
+ bool ime_candidate_window_open_;
+
// Security UI-related data.
COLORREF background_color_;
ToolbarModel::SecurityLevel security_level_;

Powered by Google App Engine
This is Rietveld 408576698