Consolidate OnKeyEvent and InputMethod code.

views/widget/widget.cc

Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index ae12bce3e55829a38236fff9e50bf89a4a467e4a..b68528ad5a6571fe981ce55e2659f26ebb27e59d 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -330,6 +330,12 @@ void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   RefreshCompositeTree();
 }
 
+bool Widget::OnKeyEvent(const KeyEvent& event) {
+  InputMethod* input_method = GetInputMethod();
+  return (input_method && input_method->OnKeyEvent(event)) ||
+      DispatchKeyEventPostIME(event);

[Ben Goodger (Google), 2011/04/15 18:23:19]

If you get rid of the delegate interface this whole function becomes:

InputMethod* input_method = GetInputMethod();
if (input_method && input_method->OnKeyEvent(event))
  return GetRootView()->OnKeyEvent(event);
return false;

... and you can delete DispatchKeyEventPostIME from this class.

[msw, 2011/04/15 19:19:57]

See James' response regarding delegate / DispatchKeyEventPostIME; I'm still
trying to grok the code 100%, hoping that this is achievable.

+}
+
 bool Widget::OnMouseEvent(const MouseEvent& event) {
   switch (event.type()) {
     case ui::ET_MOUSE_PRESSED:
@@ -404,6 +410,13 @@ View* Widget::GetFocusTraversableParentView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Widget, internal::InputMethodDelegate implementation:
+
+bool Widget::DispatchKeyEventPostIME(const KeyEvent& event) {
+  return GetRootView()->OnKeyEvent(event);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 RootView* Widget::CreateRootView() {