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 775 matching lines @@
 
 void WidgetWin::OnInputLangChange(DWORD character_set, HKL input_language_id) {
   if (is_input_method_win_) {
     static_cast<InputMethodWin*>(input_method_.get())->OnInputLangChange(
         character_set, 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;
 }
 
 void WidgetWin::OnKillFocus(HWND focused_window) {
   delegate_->OnNativeBlur(focused_window);
   if (input_method_.get())
     input_method_->OnBlur();
   SetMsgHandled(FALSE);
 }
 
@@ skipping 207 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 64 matching lines @@
     layered_window_contents_.reset(
         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));
+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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 // static
 Widget* Widget::CreateWidget(const CreateParams& params) {
   WidgetWin* widget = new WidgetWin;
   widget->SetCreateParams(params);
   return widget;
@@ skipping 149 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