Consolidate OnKeyEvent and InputMethod code.

views/widget/widget.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.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "views/focus/view_storage.h"
@@ skipping 312 matching lines @@
 
 bool Widget::HasFocusManager() const {
   return !!focus_manager_.get();
 }
 
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   GetRootView()->Paint(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:
       last_mouse_event_was_move_ = false;
       if (GetRootView()->OnMousePressed(event)) {
         is_mouse_button_pressed_ = true;
         if (!native_widget_->HasMouseCapture())
           native_widget_->SetMouseCapture();
         return true;
       }
@@ skipping 54 matching lines @@
 }
 
 View* Widget::GetFocusTraversableParentView() {
   // We are a proxy to the root view, so we should be bypassed when traversing
   // up and as a result this should not be called.
   NOTREACHED();
   return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Widget, internal::InputMethodDelegate implementation:
+
+bool Widget::DispatchKeyEventPostIME(const KeyEvent& event) {
+  return GetRootView()->OnKeyEvent(event);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 RootView* Widget::CreateRootView() {
   return new RootView(this);
 }
 
 void Widget::DestroyRootView() {
   root_view_.reset();
 
   // Defer focus manager's destruction. This is for the case when the
@@ skipping 35 matching lines @@
     compositor_ = ui::Compositor::Create(widget);
 
   return compositor_.get() != NULL;
 }
 
 bool Widget::ShouldReleaseCaptureOnMouseReleased() const {
   return true;
 }
 
 }  // namespace views