Re-enable CJK omnibox suggest on Metro UI

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 14 matching lines @@
 
 class LocationBarView;
 class OmniboxPopupView;
 
 namespace views {
 class MenuRunner;
 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.
 class OmniboxViewWin
     : public CWindowImpl<OmniboxViewWin,
                          CRichEditCtrl,
                          CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL |
                                     ES_NOHIDESEL> >,
       public CRichEditCommands<OmniboxViewWin>,
       public ui::SimpleMenuModel::Delegate,
@@ skipping 332 matching lines @@
   int GetHorizontalMargin() const;
 
   // Returns the width in pixels needed to display |text|.
   int WidthNeededToDisplay(const string16& text) const;
 
   // Real implementation of OnAfterPossibleChange() method.
   // If |force_text_changed| is true, then the text_changed code will always be
   // 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);
 
   // Whether to show the menu item for copying the URL.
   bool ShouldEnableCopyURL() const;
   void CopyURL();
 
   // Handle of RichEdit dll.
   static HMODULE loaded_library_module_;
 
@@ skipping 107 matching lines @@
   // This contains the scheme char start and stop indexes that should be
   // stricken-out when displaying an insecure scheme.
   url_parse::Component insecure_scheme_component_;
 
   // Instance of accessibility information and handling.
   mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_;
 
   // 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);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_