Index: chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc |
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc |
index 559ceb5bbea2c7558711fda794eb0b1d29d395c0..fdde5fbb1250f959a192a29c6fa4e982e0bd7711 100644 |
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc |
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc |
@@ -621,9 +621,11 @@ void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context, |
UnloadedExtensionInfo::Reason reason) { |
const std::vector<InputComponentInfo>* input_components = |
InputComponents::GetInputComponents(extension); |
+ if (!input_components || input_components->empty()) |
+ return; |
InputImeEventRouter* event_router = |
GetInputImeEventRouter(Profile::FromBrowserContext(browser_context)); |
- if (input_components && !input_components->empty() && event_router) { |
+ if (event_router) { |
event_router->UnregisterAllImes(extension->id()); |
} |
} |