| 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 =
|
|
|