Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: ui/base/ime/chromeos/extension_ime_util.cc

Issue 1242023005: Remove legacy StartsWithASCII function. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: y Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/chromeos/component_extension_ime_manager.cc ('k') | ui/base/l10n/l10n_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/extension_ime_util.cc
diff --git a/ui/base/ime/chromeos/extension_ime_util.cc b/ui/base/ime/chromeos/extension_ime_util.cc
index f6960d4816a8a4db0a80843f078ec59889abf206..71440a180d072daa865e818331c3cf542c16d7d6 100644
--- a/ui/base/ime/chromeos/extension_ime_util.cc
+++ b/ui/base/ime/chromeos/extension_ime_util.cc
@@ -61,28 +61,31 @@ std::string GetComponentIDByInputMethodID(const std::string& input_method_id) {
}
std::string GetInputMethodIDByEngineID(const std::string& engine_id) {
- if (base::StartsWithASCII(engine_id, kComponentExtensionIMEPrefix, true) ||
- base::StartsWithASCII(engine_id, kExtensionIMEPrefix, true)) {
+ if (base::StartsWith(engine_id, kComponentExtensionIMEPrefix,
+ base::CompareCase::SENSITIVE) ||
+ base::StartsWith(engine_id, kExtensionIMEPrefix,
+ base::CompareCase::SENSITIVE)) {
return engine_id;
}
- if (base::StartsWithASCII(engine_id, "xkb:", true))
+ if (base::StartsWith(engine_id, "xkb:", base::CompareCase::SENSITIVE))
return GetComponentInputMethodID(kXkbExtensionId, engine_id);
- if (base::StartsWithASCII(engine_id, "vkd_", true))
+ if (base::StartsWith(engine_id, "vkd_", base::CompareCase::SENSITIVE))
return GetComponentInputMethodID(kM17nExtensionId, engine_id);
- if (base::StartsWithASCII(engine_id, "nacl_mozc_", true))
+ if (base::StartsWith(engine_id, "nacl_mozc_", base::CompareCase::SENSITIVE))
return GetComponentInputMethodID(kMozcExtensionId, engine_id);
- if (base::StartsWithASCII(engine_id, "hangul_", true))
+ if (base::StartsWith(engine_id, "hangul_",
+ base::CompareCase::SENSITIVE))
return GetComponentInputMethodID(kHangulExtensionId, engine_id);
- if (base::StartsWithASCII(engine_id, "zh-", true) &&
+ if (base::StartsWith(engine_id, "zh-", base::CompareCase::SENSITIVE) &&
engine_id.find("pinyin") != std::string::npos) {
return GetComponentInputMethodID(kChinesePinyinExtensionId, engine_id);
}
- if (base::StartsWithASCII(engine_id, "zh-", true) &&
+ if (base::StartsWith(engine_id, "zh-", base::CompareCase::SENSITIVE) &&
engine_id.find("zhuyin") != std::string::npos) {
return GetComponentInputMethodID(kChineseZhuyinExtensionId, engine_id);
}
- if (base::StartsWithASCII(engine_id, "zh-", true) &&
+ if (base::StartsWith(engine_id, "zh-", base::CompareCase::SENSITIVE) &&
engine_id.find("cangjie") != std::string::npos) {
return GetComponentInputMethodID(kChineseCangjieExtensionId, engine_id);
}
@@ -93,30 +96,30 @@ std::string GetInputMethodIDByEngineID(const std::string& engine_id) {
}
bool IsExtensionIME(const std::string& input_method_id) {
- return base::StartsWithASCII(input_method_id, kExtensionIMEPrefix,
- true /* Case sensitive */) &&
+ return base::StartsWith(input_method_id, kExtensionIMEPrefix,
+ base::CompareCase::SENSITIVE) &&
input_method_id.size() >
kExtensionIMEPrefixLength + kExtensionIdLength;
}
bool IsComponentExtensionIME(const std::string& input_method_id) {
- return base::StartsWithASCII(input_method_id, kComponentExtensionIMEPrefix,
- true /* Case sensitive */) &&
+ return base::StartsWith(input_method_id, kComponentExtensionIMEPrefix,
+ base::CompareCase::SENSITIVE) &&
input_method_id.size() >
kComponentExtensionIMEPrefixLength + kExtensionIdLength;
}
bool IsMemberOfExtension(const std::string& input_method_id,
const std::string& extension_id) {
- return base::StartsWithASCII(input_method_id,
- kExtensionIMEPrefix + extension_id,
- true /* Case sensitive */);
+ return base::StartsWith(input_method_id,
+ kExtensionIMEPrefix + extension_id,
+ base::CompareCase::SENSITIVE);
}
bool IsKeyboardLayoutExtension(const std::string& input_method_id) {
if (IsComponentExtensionIME(input_method_id))
- return base::StartsWithASCII(GetComponentIDByInputMethodID(input_method_id),
- "xkb:", true);
+ return base::StartsWith(GetComponentIDByInputMethodID(input_method_id),
+ "xkb:", base::CompareCase::SENSITIVE);
return false;
}
« no previous file with comments | « ui/base/ime/chromeos/component_extension_ime_manager.cc ('k') | ui/base/l10n/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698