| Index: chrome/browser/extensions/component_loader.cc
|
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
|
| index e361d6800a52399b80379485365ea82d7253cabf..48254827b03aa3bb20687ff57d9cea8a0a938428 100644
|
| --- a/chrome/browser/extensions/component_loader.cc
|
| +++ b/chrome/browser/extensions/component_loader.cc
|
| @@ -440,8 +440,10 @@ void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
|
| return;
|
|
|
| // Component extensions needed for kiosk apps.
|
| - AddFileManagerExtension();
|
| + // Note: Video player should be avove the file manager, since the video
|
| + // player is the default app for video files by default.
|
| AddVideoPlayerExtension();
|
| + AddFileManagerExtension();
|
|
|
| // Add virtual keyboard.
|
| AddKeyboardApp();
|
| @@ -471,8 +473,11 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
|
| #endif
|
|
|
| if (!skip_session_components) {
|
| - AddFileManagerExtension();
|
| + // Note: Video player should be avove the file manager, since the video
|
| + // player is the default app for video files by default.
|
| AddVideoPlayerExtension();
|
| + AddFileManagerExtension();
|
| +
|
| AddHangoutServicesExtension();
|
| AddHotwordHelperExtension();
|
| AddImageLoaderExtension();
|
|
|