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

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

Issue 11141019: Re-enable CJK omnibox suggest on Metro UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 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 7a9e8dbc4dcd5149dccb0ae6aa8a4b1fd9c3ee0a..1a81cabe234847e6bfab9a888f6aaf4dfdec77da 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
@@ -32,6 +32,10 @@ class NativeViewHost;
class View;
}
+namespace ui {
+class TsfEventRouter;
+}
+
// Provides the implementation of an edit control with a drop-down
// autocomplete box. The box itself is implemented in autocomplete_popup.cc
// This file implements the edit box and management for the popup.
@@ -384,6 +388,15 @@ class OmniboxViewWin
// triggerred no matter if the text is actually changed or not.
bool OnAfterPossibleChangeInternal(bool force_text_changed);
+ // Callback function expected to be invoked when the text contents are
+ // updated by TSF. This callback should not be called when IMM32 is used.
+ void OnTextUpdatedByTsf();
+
+ // Callback function expected to be invoked when the number of currently
+ // candidate window opend is changed. This callback should not be called when
falken 2012/10/18 02:15:54 "currently opened candidate windows" (if I unders
Seigo Nonaka 2012/10/18 10:02:23 Done.
+ // IMM32 is used.
+ void OnCandidateWindowCountChangedByTsf(size_t window_count);
+
// Common implementation for performing a drop on the edit view.
int OnPerformDropImpl(const ui::DropTargetEvent& event, bool in_drag);
@@ -511,6 +524,12 @@ class OmniboxViewWin
// The native view host.
views::NativeViewHost* native_view_host_;
+ // TSF related event router.
+ scoped_refptr<ui::TsfEventRouter> tsf_event_router_;
+
+ // Weak pointer factory used for making callbacks.
+ base::WeakPtrFactory<OmniboxViewWin> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
};

Powered by Google App Engine
This is Rietveld 408576698