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

ui/base/ime/chromeos/component_extension_ime_manager.h

 // Copyright 2013 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_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>
 
 #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.
   std::string display_name;  // The display name.
   std::string indicator;  // The indicator text.
   std::vector<std::string> language_codes;  // The engine's language(ex. "en").
   std::string description;  // The engine description.
   std::vector<std::string> layouts;  // The list of keyboard layout of engine.
   GURL options_page_url; // an URL to option page.
   GURL input_view_url; // an URL to input view page.
 };
 
 // Represents a component extension IME.
-struct CHROMEOS_EXPORT ComponentExtensionIME {
+struct UI_BASE_EXPORT ComponentExtensionIME {
   ComponentExtensionIME();
   ~ComponentExtensionIME();
   std::string id;  // extension id.
   std::string manifest;  // the contents of manifest.json
   std::string description;  // description of extension.
   GURL options_page_url; // an URL to option page.
   base::FilePath path;
   std::vector<ComponentExtensionEngine> engines;
 };
 
 // Provides an interface to list/load/unload for component extension IME.
-class CHROMEOS_EXPORT ComponentExtensionIMEManagerDelegate {
+class UI_BASE_EXPORT ComponentExtensionIMEManagerDelegate {
  public:
   ComponentExtensionIMEManagerDelegate();
   virtual ~ComponentExtensionIMEManagerDelegate();
 
   // Lists installed component extension IMEs.
   virtual std::vector<ComponentExtensionIME> ListIME() = 0;
 
   // Loads component extension IME associated with |extension_id|.
   // Returns false if it fails, otherwise returns true.
   virtual void Load(Profile* profile,
                     const std::string& extension_id,
                     const std::string& manifest,
                     const base::FilePath& path) = 0;
 
   // Unloads component extension IME associated with |extension_id|.
   virtual void Unload(Profile* profile,
                       const std::string& extension_id,
                       const base::FilePath& path) = 0;
 };
 
 // This class manages component extension input method.
-class CHROMEOS_EXPORT ComponentExtensionIMEManager {
+class UI_BASE_EXPORT ComponentExtensionIMEManager {
  public:
   ComponentExtensionIMEManager();
   virtual ~ComponentExtensionIMEManager();
 
   // Initializes component extension manager. This function create internal
   // mapping between input method id and engine components. This function must
   // be called before using any other function.
   void Initialize(scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate);
 
   // Loads |input_method_id| component extension IME. This function returns true
@@ skipping 40 matching lines @@
   // It's filled by Initialize() method and never changed during runtime.
   std::set<std::string> input_method_id_set_;
 
   std::set<std::string> login_layout_set_;
 
   DISALLOW_COPY_AND_ASSIGN(ComponentExtensionIMEManager);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_
+#endif  // UI_CHROMEOS_IME_COMPONENT_EXTENSION_IME_MANAGER_H_