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

chrome/browser/extensions/extension_file_browser_private_api.cc

 // Copyright (c) 2011 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/extension_file_browser_private_api.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 38 matching lines @@
 #include "webkit/fileapi/file_system_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #ifdef OS_CHROMEOS
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
 // Error messages.
 const char kFileError[] = "File error %d";
 const char kInvalidFileUrl[] = "Invalid file URL";
+#ifdef OS_CHROMEOS
 const char kVolumeDevicePathNotFound[] = "Device path not found";
+#endif
 
 #ifdef OS_CHROMEOS
 // Volume type strings.
 const std::string kVolumeTypeFlash = "flash";
 const std::string kVolumeTypeOptical = "optical";
 const std::string kVolumeTypeHardDrive = "hdd";
 const std::string kVolumeTypeUnknown = "undefined";
 #endif
 
 // Internal task ids.
@@ skipping 464 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this,
           &FileWatchBrowserFunctionBase::RespondOnUIThread,
           true));
 }
 
 bool AddFileWatchBrowserFunction::PerformFileWatchOperation(
     const FilePath& local_path, const FilePath& virtual_path,
     const std::string& extension_id) {
-#if defined(OS_CHROMEOS)
   return profile_->GetExtensionService()->file_browser_event_router()->
       AddFileWatch(local_path, virtual_path, extension_id);
-#else
-  return true;
-#endif  // OS_CHROMEOS
 }
 
 bool RemoveFileWatchBrowserFunction::PerformFileWatchOperation(
     const FilePath& local_path, const FilePath& unused,
     const std::string& extension_id) {
-#if defined(OS_CHROMEOS)
   profile_->GetExtensionService()->file_browser_event_router()->
       RemoveFileWatch(local_path, extension_id);
-#endif
   return true;
 }
 
 bool GetFileTasksFileBrowserFunction::RunImpl() {
   ListValue* files_list = NULL;
   if (!args_->GetList(0, &files_list))
     return false;
 
   std::vector<GURL> file_urls;
   for (size_t i = 0; i < files_list->GetSize(); ++i) {
@@ skipping 605 matching lines @@
   }
 
   std::string mount_type_str;
   if (!args_->GetString(1, &mount_type_str)) {
     return false;
   }
 
   UrlList file_paths;
   file_paths.push_back(GURL(file_url));
 
-#if defined(OS_CHROMEOS)
   chromeos::MountPathOptions options;
   if (args_->GetSize() == 3) {
     DictionaryValue *dict;
     if (!args_->GetDictionary(2, &dict)) {
       NOTREACHED();
     }
 
     for (base::DictionaryValue::key_iterator it = dict->begin_keys();
          it != dict->end_keys();
          ++it) {
       std::string value;
       if (!dict->GetString(*it, &value)) {
         NOTREACHED();
       }
 
       options.push_back(chromeos::MountPathOptions::value_type((*it).c_str(),
                                                                value.c_str()));
     }
   }
 
   MountParamaters* params = new MountParamaters(mount_type_str, options);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this,
           &AddMountFunction::GetLocalPathsOnFileThread,
           file_paths, reinterpret_cast<void*>(params)));
-#endif  // OS_CHROMEOS
 
   return true;
 }
 
 void AddMountFunction::GetLocalPathsResponseOnUIThread(
     const FilePathList& files, void* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(context);
+  scoped_ptr<MountParamaters> params(
+      reinterpret_cast<MountParamaters*>(context));
 
   if (!files.size()) {
     SendResponse(false);
     return;
   }
 
-#ifdef OS_CHROMEOS
-  scoped_ptr<MountParamaters> params(
-      reinterpret_cast<MountParamaters*>(context));
   const std::string& mount_type_str = params->mount_type;
   const chromeos::MountPathOptions& options = params->mount_options;
   FilePath::StringType source_file = files[0].value();
 
+#ifdef OS_CHROMEOS
   chromeos::MountLibrary *mount_lib =
       chromeos::CrosLibrary::Get()->GetMountLibrary();
 
   chromeos::MountType mount_type =
       mount_lib->MountTypeFromString(mount_type_str);
   if (mount_type == chromeos::MOUNT_TYPE_INVALID) {
     error_ = "Invalid mount type";
     SendResponse(false);
     return;
   }
@@ skipping 332 matching lines @@
   SET_STRING(IDS_FILE_BROWSER, ID3_USER_DEFINED_URL_LINK_FRAME);  // WXXX
 
   SET_STRING(IDS_FILEBROWSER, ENQUEUE);
 #undef SET_STRING
 
   // TODO(serya): Create a new string in .grd file for this one in M13.
   dict->SetString("PREVIEW_IMAGE",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
   dict->SetString("PLAY_MEDIA",
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
-#if defined(OS_CHROMEOS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableArchives))
     dict->SetString("ENABLE_ARCHIVES", "true");
-#endif
 
   return true;
 }