Integrate the new input method API for Views into Chromium.

views/widget/widget_gtk.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_GTK_H_
 #define VIEWS_WIDGET_WIDGET_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "base/message_loop.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/x/active_window_watcher_x.h"
 #include "ui/gfx/size.h"
 #include "views/focus/focus_manager.h"
+#include "views/ime/input_method_delegate.h"
+#include "views/ime/input_method_gtk.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/widget.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class OSExchangeData;
 class OSExchangeDataProviderGtk;
 }
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
 
 namespace views {
 
 class DropTargetGtk;
 class TooltipManagerGtk;
 class View;
 class WindowGtk;
 
 namespace internal {
 class NativeWidgetDelegate;
 }
 
 // Widget implementation for GTK.
 class WidgetGtk : public Widget,
                   public NativeWidget,
-                  public ui::ActiveWindowWatcherX::Observer {
+                  public ui::ActiveWindowWatcherX::Observer,
+                  public internal::InputMethodDelegate {
  public:
   // Type of widget.
   enum Type {
     // Used for popup type windows (bubbles, menus ...).
     // NOTE: on X windows of this type can NOT get focus. If you need a popup
     // like widget that can be focused use TYPE_WINDOW and set the window type
     // to WINDOW_TYPE_CHROME_INFO_BUBBLE.
     TYPE_POPUP,
 
     // A top level window with no title or control buttons.
@@ skipping 123 matching lines @@
 
   // Overridden from NativeWidget:
   virtual Widget* GetWidget() OVERRIDE;
   virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
   virtual void* GetNativeWindowProperty(const char* name) OVERRIDE;
   virtual TooltipManager* GetTooltipManager() const OVERRIDE;
   virtual bool IsScreenReaderActive() const OVERRIDE;
   virtual void SetNativeCapture() OVERRIDE;
   virtual void ReleaseNativeCapture() OVERRIDE;
   virtual bool HasNativeCapture() const OVERRIDE;
+  virtual InputMethod* GetInputMethodNative() OVERRIDE;
+  virtual void ReplaceInputMethod(InputMethod* input_method) OVERRIDE;
   virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE;
   virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void MoveAbove(Widget* widget) OVERRIDE;
   virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void CloseNow() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void SetOpacity(unsigned char opacity) OVERRIDE;
@@ skipping 87 matching lines @@
  private:
   class DropObserver;
   friend class DropObserver;
 
   // Overridden from Widget
   virtual RootView* CreateRootView() OVERRIDE;
 
   // Overridden from NativeWidget
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
 
+  // Overridden from internal::InputMethodDelegate
+  virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
+
   CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnWindowPaint, GdkEventExpose*);
 
   // Process a mouse click.
   bool ProcessMousePressed(GdkEventButton* event);
   void ProcessMouseReleased(GdkEventButton* event);
   // Process scroll event.
   bool ProcessScroll(GdkEventScroll* event);
 
   // Returns the first ancestor of |widget| that is a window.
   static Window* GetWindowImpl(GtkWidget* widget);
@@ skipping 113 matching lines @@
   // This is false by default.
   bool is_double_buffered_;
 
   // Indicates if we should handle the upcoming Alt key release event.
   bool should_handle_menu_key_release_;
 
   // Valid for the lifetime of StartDragForViewFromMouseEvent, indicates the
   // view the drag started from.
   View* dragged_view_;
 
+  scoped_ptr<InputMethod> input_method_;

[sadrul, 2011/03/21 19:57:45]

Would it be possible to move input_method_ to Widget (instead of in WidgetGtk
and WidgetWin)? (You could look at Widget::compositor_ for an example)

[James Su, 2011/03/21 21:34:07]

IMHO, it's not possible, different input method implementations may communicate
with native widgets in different ways. Moving input_method_ into Widget would
require lots of down casts in native widget code.

+
   DISALLOW_COPY_AND_ASSIGN(WidgetGtk);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_GTK_H_