Index: ui/base/ime/chromeos/extension_ime_util.h |
diff --git a/ui/base/ime/chromeos/extension_ime_util.h b/ui/base/ime/chromeos/extension_ime_util.h |
index 3f52d39055530264eb4577593f8c9c84e9d4c588..08dbc7b5c3428b38f14321989280d56bf530fcdf 100644 |
--- a/ui/base/ime/chromeos/extension_ime_util.h |
+++ b/ui/base/ime/chromeos/extension_ime_util.h |
@@ -8,7 +8,7 @@ |
#include <string> |
#include "base/auto_reset.h" |
-#include "ui/base/ui_base_export.h" |
+#include "ui/base/ime/ui_base_ime_export.h" |
namespace chromeos { |
@@ -38,60 +38,60 @@ const char kChineseCangjieExtensionId[] = "aeebooiibjahgpgmhkeocbeekccfknbj"; |
// Returns InputMethodID for |engine_id| in |extension_id| of extension IME. |
// This function does not check |extension_id| is installed extension IME nor |
// |engine_id| is really a member of |extension_id|. |
-std::string UI_BASE_EXPORT GetInputMethodID(const std::string& extension_id, |
- const std::string& engine_id); |
+std::string UI_BASE_IME_EXPORT |
+GetInputMethodID(const std::string& extension_id, const std::string& engine_id); |
// Returns InputMethodID for |engine_id| in |extension_id| of component |
// extension IME, This function does not check |extension_id| is component one |
// nor |engine_id| is really a member of |extension_id|. |
-std::string UI_BASE_EXPORT GetComponentInputMethodID( |
- const std::string& extension_id, |
- const std::string& engine_id); |
+std::string UI_BASE_IME_EXPORT |
+GetComponentInputMethodID(const std::string& extension_id, |
+ const std::string& engine_id); |
// Returns extension ID if |input_method_id| is extension IME ID or component |
// extension IME ID. Otherwise returns an empty string (""). |
-std::string UI_BASE_EXPORT GetExtensionIDFromInputMethodID( |
- const std::string& input_method_id); |
+std::string UI_BASE_IME_EXPORT |
+GetExtensionIDFromInputMethodID(const std::string& input_method_id); |
// Returns InputMethodID from engine id (e.g. xkb:fr:fra), or returns itself if |
// the |engine_id| is not a known engine id. |
// The caller must make sure the |engine_id| is from system input methods |
// instead of 3rd party input methods. |
-std::string UI_BASE_EXPORT GetInputMethodIDByEngineID( |
- const std::string& engine_id); |
+std::string UI_BASE_IME_EXPORT |
+GetInputMethodIDByEngineID(const std::string& engine_id); |
// Returns true if |input_method_id| is extension IME ID. This function does not |
// check |input_method_id| is installed extension IME. |
-bool UI_BASE_EXPORT IsExtensionIME(const std::string& input_method_id); |
+bool UI_BASE_IME_EXPORT IsExtensionIME(const std::string& input_method_id); |
// Returns true if |input_method_id| is component extension IME ID. This |
// function does not check |input_method_id| is really whitelisted one or not. |
// If you want to check |input_method_id| is whitelisted component extension |
// IME, please use ComponentExtensionIMEManager::IsWhitelisted instead. |
-bool UI_BASE_EXPORT IsComponentExtensionIME( |
- const std::string& input_method_id); |
+bool UI_BASE_IME_EXPORT |
+IsComponentExtensionIME(const std::string& input_method_id); |
// Returns true if the |input_method| is a member of |extension_id| of extension |
// IME, otherwise returns false. |
-bool UI_BASE_EXPORT IsMemberOfExtension(const std::string& input_method_id, |
+bool UI_BASE_IME_EXPORT IsMemberOfExtension(const std::string& input_method_id, |
const std::string& extension_id); |
// Returns true if the |input_method_id| is the extension based xkb keyboard, |
// otherwise returns false. |
-bool UI_BASE_EXPORT IsKeyboardLayoutExtension( |
- const std::string& input_method_id); |
+bool UI_BASE_IME_EXPORT |
+IsKeyboardLayoutExtension(const std::string& input_method_id); |
// Returns input method component id from the extension-based InputMethodID |
// for component IME extensions. This function does not check that |
// |input_method_id| is installed. |
-std::string UI_BASE_EXPORT |
- GetComponentIDByInputMethodID(const std::string& input_method_id); |
+std::string UI_BASE_IME_EXPORT |
+GetComponentIDByInputMethodID(const std::string& input_method_id); |
// Gets legacy xkb id (e.g. xkb:us::eng) from the new extension based xkb id |
// (e.g. _comp_ime_...xkb:us::eng). If the given id is not prefixed with |
// 'xkb:', just return the same as the given id. |
-std::string UI_BASE_EXPORT MaybeGetLegacyXkbId( |
- const std::string& input_method_id); |
+std::string UI_BASE_IME_EXPORT |
+MaybeGetLegacyXkbId(const std::string& input_method_id); |
} // namespace extension_ime_util |