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

ui/base/ime/chromeos/composition_text.h

Index: ui/base/ime/chromeos/composition_text.h
diff --git a/chromeos/ime/composition_text.h b/ui/base/ime/chromeos/composition_text.h
similarity index 87%
rename from chromeos/ime/composition_text.h
rename to ui/base/ime/chromeos/composition_text.h
index 9cc0d1380b6ae4c761f7cb7e831d8497f921cc8c..6060928333bb147411fede48c2f58cfcab8433b3 100644
--- a/chromeos/ime/composition_text.h
+++ b/ui/base/ime/chromeos/composition_text.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_IME_COMPOSITION_TEXT_H_
-#define CHROMEOS_IME_COMPOSITION_TEXT_H_
+#ifndef UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_
+#define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_

[stevenjb, 2014/11/20 19:09:52]

Since as you mention there is already a ui/base/ime/composition_text.h, I think
this should be renamed composition_text_chromeos.h (and .cc, _unittest.cc).
Personally I would also rename the class to ChompositionTextChromeos even though
it is in the chromeos namespace, just to help with searchability, but that is
entirely optional.

 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "chromeos/chromeos_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace chromeos {
 
-class CHROMEOS_EXPORT CompositionText {
+class UI_BASE_EXPORT CompositionText {
  public:
   enum UnderlineType {
     COMPOSITION_TEXT_UNDERLINE_SINGLE = 1,
@@ -67,4 +67,4 @@ class CHROMEOS_EXPORT CompositionText {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_IME_COMPOSITION_TEXT_H_
+#endif  // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_