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>
 #include <atlctrls.h>
 #include <atlmisc.h>
 #include <peninputpanel.h>
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
+#include "ui/base/ime/win/tsf_event_router.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/win/extra_sdk_defines.h"
 #include "ui/gfx/font.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class LocationBarView;
 class OmniboxPopupView;
 
 namespace views {
 class MenuRunner;
 class NativeViewHost;
 class View;
 }
 
 // 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,
+      public ui::TsfEventRouter::Observer,
       public OmniboxView {
  public:
   struct State {
     State(const CHARRANGE& selection,
           const CHARRANGE& saved_selection_for_focus_change)
         : selection(selection),
           saved_selection_for_focus_change(saved_selection_for_focus_change) {
     }
 
     const CHARRANGE selection;
@@ skipping 267 matching lines @@
   // click.  Sadly, we need to clip slightly differently in this case.
   LONG ClipXCoordToVisibleText(LONG x, bool is_triple_click) const;
 
   virtual int GetOmniboxTextLength() const OVERRIDE;
 
   // Parses the contents of the control for the scheme and the host name.
   // Highlights the scheme in green or red depending on it security level.
   // If a host name is found, it makes it visually stronger.
   virtual void EmphasizeURLComponents() OVERRIDE;
 
+  // TsfEventRouter::Observer override.

[Peter Kasting, 2012/10/19 18:40:57]

Nit: If the IMM32 comment is useful, put it in the TsfEventRouter::Observer
declarations.  Then declare the overrides this way:

  // TsfEventRouter::Observer:
  virtual void OnTextUpdated() OVERRIDE;
  virtual void OnCandidateWindowCountChanged(size_t window_count) OVERRIDE;

(Frankly, the other overrides here should do the same, but you need not fix
those.)

[Seigo Nonaka, 2012/10/22 03:11:04]

Done.

+  // This callback should not be called when IMM32 is used.
+  virtual void OnTextUpdated() OVERRIDE;
+
+  // TsfEventRouter::Observer override.
+  // This callback should not be called when IMM32 is used.
+  virtual void OnCandidateWindowCountChanged(size_t window_count) OVERRIDE;
+
   // Erases the portion of the selection in the font's y-adjustment area.  For
   // some reason the edit draws the selection rect here even though it's not
   // part of the font.
   void EraseTopOfSelection(CDC* dc,
                            const CRect& client_rect,
                            const CRect& paint_clip_rect);
 
   // Draws a slash across the scheme if desired.
   void DrawSlashForInsecureScheme(HDC hdc,
                                   const CRect& client_rect,
@@ skipping 162 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_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_