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

ui/base/ime/chromeos/composition_text.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_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,
     COMPOSITION_TEXT_UNDERLINE_DOUBLE = 2,
     COMPOSITION_TEXT_UNDERLINE_NONE = 4,
     COMPOSITION_TEXT_UNDERLINE_ERROR = 8,
   };
 
   struct UnderlineAttribute {
     UnderlineType type;
@@ skipping 32 matching lines @@
   base::string16 text_;
   std::vector<UnderlineAttribute> underline_attributes_;
   uint32 selection_start_;
   uint32 selection_end_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositionText);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_IME_COMPOSITION_TEXT_H_
+#endif  // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_