Consolidate OnKeyEvent and InputMethod code.

views/widget/widget_win.cc

 // Copyright (c) 2011 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 "views/widget/widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 1000 matching lines @@
   while (parent) {
     WidgetWin* widget =
         reinterpret_cast<WidgetWin*>(ui::GetWindowUserData(parent));
     if (widget && widget->is_window_)
       return static_cast<WindowWin*>(widget);
     parent = ::GetParent(parent);
   }
   return NULL;
 }
 
-RootView* WidgetWin::GetFocusedViewRootView() {
-  // TODO(beng): get rid of this
-  FocusManager* focus_manager = GetFocusManager();
-  if (!focus_manager) {
-    NOTREACHED();
-    return NULL;
-  }
-  View* focused_view = focus_manager->GetFocusedView();
-  if (!focused_view)
-    return NULL;
-  return focused_view->GetRootView();
-}
-
 // static
 void WidgetWin::PostProcessActivateMessage(WidgetWin* widget,
                                            int activation_state) {
   if (!widget->delegate_->HasFocusManager()) {
     NOTREACHED();
     return;
   }
   FocusManager* focus_manager = widget->GetWidget()->GetFocusManager();
   if (WA_INACTIVE == activation_state) {
     // We might get activated/inactivated without being enabled, so we need to
@@ skipping 65 matching lines @@
         new gfx::CanvasSkia(s.width(), s.height(), false));
   }
 }
 
 gfx::AcceleratedWidget WidgetWin::GetAcceleratedWidget() {
   // TODO(beng):
   return gfx::kNullAcceleratedWidget;
 }
 
 void WidgetWin::DispatchKeyEventPostIME(const KeyEvent& key) {
-  RootView* root_view = GetFocusedViewRootView();
-  if (!root_view)
-    root_view = GetRootView();
-
-  SetMsgHandled(root_view->ProcessKeyEvent(key));
+  SetMsgHandled(delegate_->OnKeyEvent(key));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 // static
 Widget* Widget::CreateWidget(const CreateParams& params) {
   WidgetWin* widget = new WidgetWin;
   widget->SetCreateParams(params);
   return widget;
@@ skipping 106 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views