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

ui/base/ime/chromeos/ime_keyboard_x11.h

 // Copyright 2014 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 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>
 #include <queue>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
 #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();
 
   // ImeKeyboard:
   virtual bool SetCurrentKeyboardLayoutByName(
       const std::string& layout_name) override;
   virtual bool ReapplyCurrentKeyboardLayout() override;
   virtual void ReapplyCurrentModifierLockStatus() override;
   virtual void DisableNumLock() override;
@@ skipping 35 matching lines @@
 
   base::WeakPtrFactory<ImeKeyboardX11> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeKeyboardX11);
 };
 
 
 } // namespace input_method
 } // namespace chromeos
 
-#endif  // CHROMEOS_IME_IME_KEYBOARD_X11_H_
+#endif  // UI_BASE_IME_CHROMEOS_IME_KEYBOARD_X11_H_