Redesign: Remove TsfEventRouter interface.

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

 // 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.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 462 matching lines @@
       font_(parent_view->font()),
       possible_drag_(false),
       in_drag_(false),
       initiated_drag_(false),
       drop_highlight_position_(-1),
       ime_candidate_window_open_(false),
       background_color_(skia::SkColorToCOLORREF(LocationBarView::GetColor(
           chrome::search::IsInstantExtendedAPIEnabled(parent_view_->profile()),
           ToolbarModel::NONE, LocationBarView::BACKGROUND))),
       security_level_(ToolbarModel::NONE),
-      text_object_model_(NULL) {
+      text_object_model_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          tsf_event_router_(base::win::IsTsfAwareRequired() ?
+              new ui::TsfEventRouter(this) : NULL)) {
   if (!loaded_library_module_)
     loaded_library_module_ = LoadLibrary(kRichEditDLLName);
 
   saved_selection_for_focus_change_.cpMin = -1;
 
   g_paint_patcher.Pointer()->RefPatch();
 
   Create(location_bar->GetWidget()->GetNativeView(), 0, 0, 0,
          l10n_util::GetExtendedStyles());
   SetReadOnly(popup_window_mode_);
@@ skipping 40 matching lines @@
     // Non-read-only edit controls have a drop target.  Revoke it so that we can
     // install our own.  Revoking automatically deletes the existing one.
     HRESULT hr = RevokeDragDrop(m_hWnd);
     DCHECK_EQ(S_OK, hr);
 
     // Register our drop target.  The scoped_refptr here will delete the drop
     // target if it fails to register itself correctly on |m_hWnd|.  Otherwise,
     // the edit control will invoke RevokeDragDrop when it's being destroyed, so
     // we don't have to do so.
     scoped_refptr<EditDropTarget> drop_target(new EditDropTarget(this));
-
-    if (base::win::IsTsfAwareRequired())
-      tsf_event_router_ = ui::TsfEventRouter::Create();
   }
 }
 
 OmniboxViewWin::~OmniboxViewWin() {
   // Explicitly release the text object model now that we're done with it, and
   // before we free the library. If the library gets unloaded before this
   // released, it becomes garbage. Note that since text_object_model_ is lazy
   // initialized, it may still be null.
   if (text_object_model_)
     text_object_model_->Release();
 
   if (tsf_event_router_)
-    tsf_event_router_->SetManager(NULL, NULL);
+    tsf_event_router_->SetManager(NULL);

[Peter Kasting, 2012/10/26 01:53:47]

Is this necessary?  Can't we just let the TsfEventRouter destructor do this
automatically?

[Seigo Nonaka, 2012/10/26 02:23:10]

Yes! done.

On 2012/10/26 01:53:47, Peter Kasting wrote:

 
   // We balance our reference count and unpatch when the last instance has
   // been destroyed.  This prevents us from relying on the AtExit or static
   // destructor sequence to do our unpatching, which is generally fragile.
   g_paint_patcher.Pointer()->DerefPatch();
 }
 
 views::View* OmniboxViewWin::parent_view() const {
   return parent_view_;
 }
@@ skipping 1049 matching lines @@
   //
   // Crazy hack: If we just do PlaceCaretAt(0), and the beginning of the text is
   // currently scrolled out of view, we can wind up with a blinking cursor in
   // the toolbar at the current X coordinate of the beginning of the text.  By
   // first doing a reverse-select-all to scroll the beginning of the text into
   // view, we work around this CRichEditCtrl bug.
   SelectAll(true);
   PlaceCaretAt(0);
 
   if (tsf_event_router_)
-    tsf_event_router_->SetManager(NULL, NULL);
+    tsf_event_router_->SetManager(NULL);
 }
 
 void OmniboxViewWin::OnLButtonDblClk(UINT keys, const CPoint& point) {
   // Save the double click info for later triple-click detection.
   tracking_double_click_ = true;
   double_click_point_ = point;
   double_click_time_ = GetCurrentMessage()->time;
   possible_drag_ = false;
 
   // Modifying the selection counts as accepting any inline autocompletion, so
@@ skipping 314 matching lines @@
     saved_selection_for_focus_change_.cpMin = -1;
   }
 
   if (!tsf_event_router_) {
     SetMsgHandled(false);
   } else {
     DefWindowProc();
     // Document manager created by RichEdit can be obtained only after
     // WM_SETFOCUS event is handled.
     tsf_event_router_->SetManager(
-        ui::TsfBridge::GetInstance()->GetThreadManager(),
-        this);
+        ui::TsfBridge::GetInstance()->GetThreadManager());
     SetMsgHandled(true);
   }
 }
 
 LRESULT OmniboxViewWin::OnSetText(const wchar_t* text) {
   // Ignore all IME messages while we process this WM_SETTEXT message.
   // When SetWindowText() is called while an IME is composing text, the IME
   // calls SendMessage() to send a WM_IME_COMPOSITION message. When we receive
   // this WM_IME_COMPOSITION message, we update the omnibox and may call
   // SetWindowText() again. To stop this recursive message-handler call, we
@@ skipping 781 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }