| Index: chrome/browser/extensions/component_loader.cc
|
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
|
| index 1f802b5164650d1b718568cb81f846bf45272e57..cb28144cb441a212992ac7b287856f31ed9bfe63 100644
|
| --- a/chrome/browser/extensions/component_loader.cc
|
| +++ b/chrome/browser/extensions/component_loader.cc
|
| @@ -285,6 +285,11 @@ void ComponentLoader::AddFileManagerExtension() {
|
| #endif // defined(FILE_MANAGER_EXTENSION)
|
| }
|
|
|
| +void ComponentLoader::AddHangoutServicesExtension() {
|
| + Add(IDR_HANGOUT_SERVICES_MANIFEST,
|
| + base::FilePath(FILE_PATH_LITERAL("hangout_services")));
|
| +}
|
| +
|
| void ComponentLoader::AddImageLoaderExtension() {
|
| #if defined(IMAGE_LOADER_EXTENSION)
|
| #ifndef NDEBUG
|
| @@ -426,7 +431,9 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
|
| base::FilePath(FILE_PATH_LITERAL("apps_debugger")));
|
| }
|
|
|
| +
|
| AddFileManagerExtension();
|
| + AddHangoutServicesExtension();
|
| AddImageLoaderExtension();
|
|
|
| #if defined(ENABLE_SETTINGS_APP)
|
|
|