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

Unified Diff: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

Issue 658183003: [Athena] Hotfix for IME component extension loading crash on sign in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove debug code. Created 6 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
index 3be6ec72b6b48eb0758358a1ffc9cc48b117a995..e69567b9d06c36607b66bc27e4a4d468e1638a34 100644
--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -254,6 +254,13 @@ void DoLoadExtension(Profile* profile,
extensions::ExtensionSystem* extension_system =
extensions::ExtensionSystem::Get(profile);
ExtensionService* extension_service = extension_system->extension_service();
+#if defined(USE_ATHENA)
+ // ExtensionService is not properly initialized for Athena yet.
+ // http://crbug.com/426787
+ if (!extension_service)
+ return;
+#endif
+ DCHECK(extension_service);
if (extension_service->GetExtensionById(extension_id, false))
return;
const std::string loaded_extension_id =
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698