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

ui/base/ime/chromeos/component_extension_ime_manager.h

Index: ui/base/ime/chromeos/component_extension_ime_manager.h
diff --git a/chromeos/ime/component_extension_ime_manager.h b/ui/base/ime/chromeos/component_extension_ime_manager.h
similarity index 90%
rename from chromeos/ime/component_extension_ime_manager.h
rename to ui/base/ime/chromeos/component_extension_ime_manager.h
index 0fcaded1529e59b6146bb738399cb289941fe8a9..5fe0ec6082166a49b2440583ccd5efc3f76adef1 100644
--- a/chromeos/ime/component_extension_ime_manager.h
+++ b/ui/base/ime/chromeos/component_extension_ime_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
-#define CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
+#ifndef UI_CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
+#define UI_CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_

[Jun Mukai, 2014/11/20 08:25:06]

Please update the macro name as UI_BASE_IME_CHROMEOS_...
same for other files.

[Shu Chen, 2014/11/20 08:34:39]

Done.

 
 #include <map>
 #include <set>
@@ -11,15 +11,15 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "chromeos/chromeos_export.h"
-#include "chromeos/ime/input_method_descriptor.h"
+#include "ui/base/ime/chromeos/input_method_descriptor.h"
+#include "ui/base/ui_base_export.h"
 
 class Profile;
 
 namespace chromeos {
 
 // Represents an engine in component extension IME.
-struct CHROMEOS_EXPORT ComponentExtensionEngine {
+struct UI_BASE_EXPORT ComponentExtensionEngine {
   ComponentExtensionEngine();
   ~ComponentExtensionEngine();
   std::string engine_id;  // The engine id.
@@ -33,7 +33,7 @@ struct CHROMEOS_EXPORT ComponentExtensionEngine {
 };
 
 // Represents a component extension IME.
-struct CHROMEOS_EXPORT ComponentExtensionIME {
+struct UI_BASE_EXPORT ComponentExtensionIME {
   ComponentExtensionIME();
   ~ComponentExtensionIME();
   std::string id;  // extension id.
@@ -45,7 +45,7 @@ struct CHROMEOS_EXPORT ComponentExtensionIME {
 };
 
 // Provides an interface to list/load/unload for component extension IME.
-class CHROMEOS_EXPORT ComponentExtensionIMEManagerDelegate {
+class UI_BASE_EXPORT ComponentExtensionIMEManagerDelegate {
  public:
   ComponentExtensionIMEManagerDelegate();
   virtual ~ComponentExtensionIMEManagerDelegate();
@@ -67,7 +67,7 @@ class CHROMEOS_EXPORT ComponentExtensionIMEManagerDelegate {
 };
 
 // This class manages component extension input method.
-class CHROMEOS_EXPORT ComponentExtensionIMEManager {
+class UI_BASE_EXPORT ComponentExtensionIMEManager {
  public:
   ComponentExtensionIMEManager();
   virtual ~ComponentExtensionIMEManager();
@@ -128,4 +128,4 @@ class CHROMEOS_EXPORT ComponentExtensionIMEManager {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
+#endif  // UI_CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_