Moves code from chromeos/ime to ui/base/ime/chromeos.

ui/chromeos/ime/ime_keyboard_x11.h

Index: ui/chromeos/ime/ime_keyboard_x11.h
diff --git a/chromeos/ime/ime_keyboard_x11.h b/ui/chromeos/ime/ime_keyboard_x11.h
similarity index 92%
rename from chromeos/ime/ime_keyboard_x11.h
rename to ui/chromeos/ime/ime_keyboard_x11.h
index 51cddd261563fcf7d0e57fe45059d74cf508f68c..f022c2f5aa877eb94f2e2ebdbdfb5ee2328cc45c 100644
--- a/chromeos/ime/ime_keyboard_x11.h
+++ b/ui/chromeos/ime/ime_keyboard_x11.h
@@ -24,17 +24,12 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_checker.h"
-#include "ui/gfx/x/x11_types.h"
-
-// These includes conflict with base/tracked_objects.h so must come last.
-#include <X11/XKBlib.h>
-#include <X11/Xlib.h>
-
+#include "ui/chromeos/ui_chromeos_export.h"
 
 namespace chromeos {
 namespace input_method {
 
-class CHROMEOS_EXPORT ImeKeyboardX11 : public ImeKeyboard {
+class UI_CHROMEOS_EXPORT ImeKeyboardX11 : public ImeKeyboard {
  public:
   ImeKeyboardX11();
   virtual ~ImeKeyboardX11();