[VideoPlayer] Remove the old video player from Files.app

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 421 matching lines @@
 
   AddDefaultComponentExtensionsWithBackgroundPages(skip_session_components);
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
     bool skip_session_components) {
   // No component extension for kiosk app launch splash screen.
   if (skip_session_components)
     return;
 
   // Component extensions needed for kiosk apps.

[hashimoto, 2014/03/25 07:47:37]

nit: We need the same comment here?

[yoshiki, 2014/03/25 08:36:46]

Done.

+  AddVideoPlayerExtension();
   AddFileManagerExtension();
-  AddVideoPlayerExtension();
 
   // Add virtual keyboard.
   AddKeyboardApp();
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     bool skip_session_components) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Component extensions with background pages are not enabled during tests
   // because they generate a lot of background behavior that can interfere.
   if (!enable_background_extensions_during_testing &&
       (command_line->HasSwitch(switches::kTestType) ||
           command_line->HasSwitch(
               switches::kDisableComponentExtensionsWithBackgroundPages))) {
     return;
   }
 
 #if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD)
   // Since this is a v2 app it has a background page.
   if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) {
     AddWithName(IDR_GENIUS_APP_MANIFEST,
                 base::FilePath(FILE_PATH_LITERAL(
                     "/usr/share/chromeos-assets/genius_app")),
                 l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME));
   }
 #endif
 
   if (!skip_session_components) {
+    // Video player should be avove the file manager, since the video player
+    // is the default app for video files by default.
+    AddVideoPlayerExtension();
     AddFileManagerExtension();
-    AddVideoPlayerExtension();
+
     AddHangoutServicesExtension();
     AddHotwordHelperExtension();
     AddImageLoaderExtension();
 
 #if defined(ENABLE_SETTINGS_APP)
     Add(IDR_SETTINGS_APP_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("settings_app")));
 #endif
   }
 
@@ skipping 127 matching lines @@
         off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
     fileapi::FileSystemContext* file_system_context =
         content::BrowserContext::GetStoragePartitionForSite(
             off_the_record_context, site)->GetFileSystemContext();
     file_system_context->EnableTemporaryFileSystemInIncognito();
   }
 #endif
 }
 
 }  // namespace extensions