Merge 266651 "linux-aura: Supports Compose key with XIM."

chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h

Index: chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
===================================================================
--- chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h	(revision 266966)
+++ chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h	(working copy)
@@ -13,6 +13,7 @@
 #include "ui/base/ime/linux/linux_input_method_context.h"
 #include "ui/gfx/rect.h"
 
+typedef struct _GdkDrawable GdkWindow;
 typedef struct _GtkIMContext GtkIMContext;
 
 namespace libgtk2ui {
@@ -60,6 +61,9 @@
   // text input type.  Can be NULL when it's not focused.
   GtkIMContext* gtk_context_;
 
+  // Last set client window.
+  GdkWindow* gdk_last_set_client_window_;
+
   // Last known caret bounds relative to the screen coordinates.
   gfx::Rect last_caret_bounds_;