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

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

Issue 190033005: [IME] Removes the duplicated IMEs in chrome://settings/languages, and support async component IMEs … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try to make test green. Created 6 years, 9 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 | « chromeos/ime/component_extension_ime_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/ime_bridge.cc
diff --git a/ui/base/ime/chromeos/ime_bridge.cc b/ui/base/ime/chromeos/ime_bridge.cc
index 7f115287f3768108f2bcabf07bd08811008c43cd..3d5ea8129e0fb2ce38e14629cfea44f6530ad630 100644
--- a/ui/base/ime/chromeos/ime_bridge.cc
+++ b/ui/base/ime/chromeos/ime_bridge.cc
@@ -66,9 +66,9 @@ class IMEBridgeImpl : public IMEBridge {
const std::string& engine_id) OVERRIDE {
std::map<std::string, IMEEngineHandlerInterface*>::const_iterator itor =
engine_handler_map_.find(engine_id);
- // |engine_id| must be found unless it's empty, but if it's not found, fall
- // back to NULL when non-debug build.
- DCHECK(itor != engine_handler_map_.end() || engine_id.empty());
+ // It is normal in that the engine is not found, because sometimes the
+ // extension based xkb id may be provided but the xkb component extension
+ // is not installed, for example, in browser_tests.
if (itor == engine_handler_map_.end()) {
engine_handler_ = NULL;
return NULL;
« no previous file with comments | « chromeos/ime/component_extension_ime_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698