Consolidate OnKeyEvent and InputMethod code.

views/widget/widget_win.cc

Index: views/widget/widget_win.cc
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index d462226704ae589d006b463fbef390d8a782d5ae..58c3d83dd19bb84dd498834c6a41e9afc8539402 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -793,11 +793,7 @@ void WidgetWin::OnInputLangChange(DWORD character_set, HKL input_language_id) {
 
 LRESULT WidgetWin::OnKeyEvent(UINT message, WPARAM w_param, LPARAM l_param) {
   MSG msg = { hwnd(), message, w_param, l_param };
-  KeyEvent key(msg);
-  if (input_method_.get())
-    input_method_->DispatchKeyEvent(key);
-  else
-    DispatchKeyEventPostIME(key);
+  delegate_->OnKeyEvent(KeyEvent(msg));
   return 0;
 }
 
@@ -1025,19 +1021,6 @@ Window* WidgetWin::GetWindowImpl(HWND hwnd) {
   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) {
@@ -1122,12 +1105,10 @@ gfx::AcceleratedWidget WidgetWin::GetAcceleratedWidget() {
   return gfx::kNullAcceleratedWidget;
 }
 
-void WidgetWin::DispatchKeyEventPostIME(const KeyEvent& key) {
-  RootView* root_view = GetFocusedViewRootView();
-  if (!root_view)
-    root_view = GetRootView();
-
-  SetMsgHandled(root_view->ProcessKeyEvent(key));
+bool WidgetWin::DispatchKeyEventPostIME(const KeyEvent& key) {
+  bool handled = Widget::DispatchKeyEventPostIME(key);
+  SetMsgHandled(handled);

[Ben Goodger (Google), 2011/04/12 21:11:15]

I prefer these SetMsgHandled things to only be called in windows message
handlers. What if this is called from somewhere else?

It seems like delegate_->OnKeyEvent() should return a bool for whether or not
it's handled, and WidgetWin::OnKeyEvent should call this function.

[msw, 2011/04/14 21:47:39]

Done.

+  return handled;
 }
 
 ////////////////////////////////////////////////////////////////////////////////