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

ui/base/ime/chromeos/ime_keyboard_x11.h

Index: ui/base/ime/chromeos/ime_keyboard_x11.h
diff --git a/chromeos/ime/ime_keyboard_x11.h b/ui/base/ime/chromeos/ime_keyboard_x11.h
similarity index 87%
rename from chromeos/ime/ime_keyboard_x11.h
rename to ui/base/ime/chromeos/ime_keyboard_x11.h
index 51cddd261563fcf7d0e57fe45059d74cf508f68c..b731b745a4b89f8077ba352c1156918870381385 100644
--- a/chromeos/ime/ime_keyboard_x11.h
+++ b/ui/base/ime/chromeos/ime_keyboard_x11.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_IME_IME_KEYBOARD_X11_H_
-#define CHROMEOS_IME_IME_KEYBOARD_X11_H_
+#ifndef UI_BASE_IME_CHROMEOS_IME_KEYBOARD_X11_H_
+#define UI_BASE_IME_CHROMEOS_IME_KEYBOARD_X11_H_
 
-#include "chromeos/ime/ime_keyboard.h"
+#include "ui/base/ime/chromeos/ime_keyboard.h"
 
 #include <cstdlib>
 #include <cstring>
@@ -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/base/ui_base_export.h"
 
 namespace chromeos {
 namespace input_method {
 
-class CHROMEOS_EXPORT ImeKeyboardX11 : public ImeKeyboard {
+class UI_BASE_EXPORT ImeKeyboardX11 : public ImeKeyboard {
  public:
   ImeKeyboardX11();
   virtual ~ImeKeyboardX11();
@@ -90,4 +85,4 @@ class CHROMEOS_EXPORT ImeKeyboardX11 : public ImeKeyboard {
 } // namespace input_method
 } // namespace chromeos
 
-#endif  // CHROMEOS_IME_IME_KEYBOARD_X11_H_
+#endif  // UI_BASE_IME_CHROMEOS_IME_KEYBOARD_X11_H_