drive: Remove DriveFileType

chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.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/chromeos/extensions/file_manager/file_browser_private_api.h"
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <utime.h>
@@ skipping 1281 matching lines @@
     // When opening a drive file, we should get local file path.
     if (params->for_opening &&
         drive::util::IsUnderDriveMountPoint(file_path)) {
       drive::DriveSystemService* system_service =
           drive::DriveSystemServiceFactory::GetForProfile(profile_);
       // |system_service| is NULL if Drive is disabled.
       if (!system_service) {
         ContinueGetSelectedFileInfo(params.Pass(),
                                     drive::FILE_ERROR_FAILED,
                                     base::FilePath(),
-                                    std::string(),
-                                    drive::REGULAR_FILE);
+                                    scoped_ptr<drive::ResourceEntry>());
         return;
       }
       system_service->file_system()->GetFileByPath(
           drive::util::ExtractDrivePath(file_path),
           base::Bind(&FileBrowserFunction::ContinueGetSelectedFileInfo,
                      this,
                      base::Passed(&params)));
       return;
     } else {
       params->selected_files.push_back(
           ui::SelectedFileInfo(file_path, base::FilePath()));
     }
   }
   params->callback.Run(params->selected_files);
 }
 
 void FileBrowserFunction::ContinueGetSelectedFileInfo(
     scoped_ptr<GetSelectedFileInfoParams> params,
     drive::FileError error,
     const base::FilePath& local_file_path,
-    const std::string& mime_type,
-    drive::DriveFileType file_type) {
+    scoped_ptr<drive::ResourceEntry> entry) {
   const int index = params->selected_files.size();
   const base::FilePath& file_path = params->file_paths[index];
   base::FilePath local_path;
   if (error == drive::FILE_ERROR_OK) {
     local_path = local_file_path;
   } else {
     DLOG(ERROR) << "Failed to get " << file_path.value()
                 << " with error code: " << error;
   }
   params->selected_files.push_back(ui::SelectedFileInfo(file_path, local_path));
@@ skipping 1217 matching lines @@
     return;
   }
 
   // Get the file on the top of the queue.
   base::FilePath drive_path = remaining_drive_paths_.front();
 
   drive::DriveSystemService* system_service =
       drive::DriveSystemServiceFactory::GetForProfile(profile_);
   // |system_service| is NULL if Drive is disabled.
   if (!system_service) {
-    OnFileReady(drive::FILE_ERROR_FAILED,
-                drive_path,
-                "",  // mime_type
-                drive::REGULAR_FILE);
+    OnFileReady(drive::FILE_ERROR_FAILED, drive_path,
+                scoped_ptr<drive::ResourceEntry>());
     return;
   }
 
   system_service->file_system()->GetFileByPath(
       drive_path,
       base::Bind(&GetDriveFilesFunction::OnFileReady, this));
 }
 
 
 void GetDriveFilesFunction::OnFileReady(
     drive::FileError error,
     const base::FilePath& local_path,
-    const std::string& unused_mime_type,
-    drive::DriveFileType file_type) {
+    scoped_ptr<drive::ResourceEntry> entry) {
   base::FilePath drive_path = remaining_drive_paths_.front();
 
   if (error == drive::FILE_ERROR_OK) {
     local_paths_->Append(new base::StringValue(local_path.value()));
     DVLOG(1) << "Got " << drive_path.value() << " as " << local_path.value();
 
     // TODO(benchan): If the file is a hosted document, a temporary JSON file
     // is created to represent the document. The JSON file is not cached and
     // should be deleted after use. We need to somehow communicate with
     // file_manager.js to manage the lifetime of the temporary file.
@@ skipping 567 matching lines @@
 OpenNewWindowFunction::OpenNewWindowFunction() {}
 
 OpenNewWindowFunction::~OpenNewWindowFunction() {}
 
 bool OpenNewWindowFunction::RunImpl() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
   file_manager_util::OpenNewWindow(profile_, GURL(url));
   return true;
 }