Re-enable CJK omnibox suggest on Metro UI

chrome/browser/ui/views/omnibox/omnibox_view_win.h

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..a9e133c82c41c3a31eca4c344b08afc73660b205 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();

[Peter Kasting, 2012/10/18 21:21:49]

Nit: Use "TSF" in place of "Tsf" everywhere.  (It would be nice to rename
TsfEventRouter too.)

[Seigo Nonaka, 2012/10/19 08:50:02]

I've renamed this function.

Is it a style convention to use uppercase for acronyms like this? I checked the
style guide and could not find anything definitive, but it uses "Url" in an
example. For the TsfEventRouter, I have been using "Tsf" prefix for all TSF
related modules.  So I'd like to keep this naming or change it in another CL.

Thanks

On 2012/10/18 21:21:49, Peter Kasting wrote:

+
+  // Callback function expected to be invoked when the number of currently
+  // opened candidate windows is changed. This callback should not be called
+  // when 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_;

[Peter Kasting, 2012/10/18 21:21:49]

Why does this need to be refcounted?  Owning it directly and nuking the weak
pointer factory would be better.

[Seigo Nonaka, 2012/10/19 08:50:02]

The reason of scoped_refptr is TsfEventRouter is COM object. However I've
removed weak pointer factory by introducing Observer class.
On 2012/10/18 21:21:49, Peter Kasting wrote:

+
+  // Weak pointer factory used for making callbacks.
+  base::WeakPtrFactory<OmniboxViewWin> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
 };