Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds.

Removes the dependency on chromeos-specific code in the extension-based file picker.  Compiles and links, but does not yet run - the extension subsystem is not finding the resources for the file_manager component extension.  The Aura build currently won't process keyboard or mouse events, so I don't have a good way to debug this.  For now, added logging, and we'll get back to it when Aura is in better shape.

BUG=chromium-os:20583
TEST=On plain ChromeOS, can still open a file with control-O file picker.

Review URL: http://codereview.chromium.org/7941014

TBR=jamescook@chromium.org
Review URL: http://codereview.chromium.org/7976025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102116 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 6 deletions

diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc
index 5739d22..25f91ce 100644
--- a/chrome/browser/extensions/file_manager_util.cc
+++ b/chrome/browser/extensions/file_manager_util.cc
@@ -9,6 +9,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/media/media_player.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/simple_message_box.h"
 #include "chrome/browser/ui/browser.h"
@@ -23,10 +24,6 @@
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_util.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/media/media_player.h"
-#endif
-
 #define FILEBROWSER_DOMAIN "hhaomjibdihmijegdhdafkllkbggdgoj"
 const char kFileBrowserDomain[] = FILEBROWSER_DOMAIN;
 #define FILEBROWSER_URL(PATH) \
@@ -241,7 +238,6 @@ void FileManagerUtil::ViewItem(const FilePath& full_path, bool enqueue) {
       browser->AddSelectedTabWithURL(GURL(path), PageTransition::LINK);
     return;
   }
-#if defined(OS_CHROMEOS)
   if (IsSupportedAVExtension(ext.data())) {
     Browser* browser = BrowserList::GetLastActive();
     if (!browser)
@@ -253,7 +249,6 @@ void FileManagerUtil::ViewItem(const FilePath& full_path, bool enqueue) {
       mediaplayer->ForcePlayMediaFile(browser->profile(), full_path, NULL);
     return;
   }
-#endif  // OS_CHROMEOS
 
   // Unknown file type. Record UMA and show an error message.
   size_t extension_index = UMAExtensionIndex(ext.data(),