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

ui/base/ime/chromeos/ime_keyboard_x11.cc

Index: ui/base/ime/chromeos/ime_keyboard_x11.cc
diff --git a/chromeos/ime/ime_keyboard_x11.cc b/ui/base/ime/chromeos/ime_keyboard_x11.cc
similarity index 95%
rename from chromeos/ime/ime_keyboard_x11.cc
rename to ui/base/ime/chromeos/ime_keyboard_x11.cc
index 8e1c7955b5b37e2bbdd2cd5a30607dcfd022f00c..a99a896ef53fc0e0f299d04f97a2c6bbdc9781e3 100644
--- a/chromeos/ime/ime_keyboard_x11.cc
+++ b/ui/base/ime/chromeos/ime_keyboard_x11.cc
@@ -2,7 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/ime/ime_keyboard_x11.h"
+#include "ui/base/ime/chromeos/ime_keyboard_x11.h"

[Yuki, 2014/11/20 09:23:03]

#include ime_keyboard_x11.h  // The corresponding header

#include <X11/foo.h>  // system headers

#include "ui/gfx/x/x11_types.h"  // our other headers

Note that there is an empty line to separate blocks.

and the comment seems not applying for now.
At a glance, we have nothing to conflict in base/tracked_obejcts.h.
Probably it's obsolete?

[Shu Chen, 2014/11/20 14:32:26]

Done.

+#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>
 
 namespace chromeos {
 namespace input_method {
@@ -280,7 +285,8 @@ bool ImeKeyboard::GetAutoRepeatEnabledForTesting() {
 }
 
 // static
-bool ImeKeyboard::GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate) {
+bool ImeKeyboard::GetAutoRepeatRateForTesting(
+    AutoRepeatRate* out_rate) {
   return XkbGetAutoRepeatRate(gfx::GetXDisplay(),
                               XkbUseCoreKbd,
                               &(out_rate->initial_delay_in_ms),
@@ -288,12 +294,15 @@ bool ImeKeyboard::GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate) {
 }
 
 // static
-bool ImeKeyboard::CheckLayoutNameForTesting(const std::string& layout_name) {
+bool ImeKeyboard::CheckLayoutNameForTesting(
+    const std::string& layout_name) {
   return CheckLayoutName(layout_name);
 }
 
 // static
-ImeKeyboard* ImeKeyboard::Create() { return new ImeKeyboardX11(); }
+ImeKeyboard* ImeKeyboard::Create() {
+  return new ImeKeyboardX11();
+}
 
 }  // namespace input_method
 }  // namespace chromeos