| Index: chrome/browser/extensions/component_loader.cc
|
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
|
| index c29cad3e217462270cb6e85c6157372ccbf74e9b..ec60802104249ce97a4f7f81436f4119d4924d87 100644
|
| --- a/chrome/browser/extensions/component_loader.cc
|
| +++ b/chrome/browser/extensions/component_loader.cc
|
| @@ -42,7 +42,6 @@
|
| #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
|
| #include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chromeos/chromeos_switches.h"
|
| -#include "chromeos/ime/input_method_manager.h"
|
| #include "content/public/browser/site_instance.h"
|
| #include "content/public/browser/storage_partition.h"
|
| #include "extensions/browser/extensions_browser_client.h"
|
| @@ -427,11 +426,6 @@ void ComponentLoader::AddDefaultComponentExtensions(
|
| // Do not add component extensions that have background pages here -- add them
|
| // to AddDefaultComponentExtensionsWithBackgroundPages.
|
| #if defined(OS_CHROMEOS)
|
| - chromeos::input_method::InputMethodManager* input_method_manager =
|
| - chromeos::input_method::InputMethodManager::Get();
|
| - if (input_method_manager)
|
| - input_method_manager->InitializeComponentExtension();
|
| -
|
| Add(IDR_MOBILE_MANIFEST,
|
| base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
|
|
|
| @@ -473,12 +467,6 @@ void ComponentLoader::AddDefaultComponentExtensions(
|
|
|
| void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
|
| bool skip_session_components) {
|
| -#if defined(OS_CHROMEOS)
|
| - chromeos::input_method::InputMethodManager* input_method_manager =
|
| - chromeos::input_method::InputMethodManager::Get();
|
| - if (input_method_manager)
|
| - input_method_manager->InitializeComponentExtension();
|
| -#endif
|
| // No component extension for kiosk app launch splash screen.
|
| if (skip_session_components)
|
| return;
|
|
|