Change the meaning of SelectFileDialog.support_drive: it means Drive-aware callers.

chrome/browser/chromeos/extensions/file_manager/private_api_util.cc

 // Copyright 2013 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/private_api_util.h"
 
 #include "base/files/file_path.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
@@ skipping 14 matching lines @@
 using content::BrowserThread;
 using google_apis::InstalledApp;
 
 namespace file_manager {
 namespace util {
 namespace {
 
 // The struct is used for GetSelectedFileInfo().
 struct GetSelectedFileInfoParams {
   bool for_opening;
+  bool need_local_path;
   GetSelectedFileInfoCallback callback;
   std::vector<base::FilePath> file_paths;
   std::vector<ui::SelectedFileInfo> selected_files;
 };
 
 // Forward declarations of helper functions for GetSelectedFileInfo().
 void ContinueGetSelectedFileInfo(Profile* profile,
                                  scoped_ptr<GetSelectedFileInfoParams> params,
                                  drive::FileError error,
                                  const base::FilePath& local_file_path,
                                  scoped_ptr<drive::ResourceEntry> entry);
 
 // Part of GetSelectedFileInfo().
 void GetSelectedFileInfoInternal(Profile* profile,
                                  scoped_ptr<GetSelectedFileInfoParams> params) {
   DCHECK(profile);
 
   for (size_t i = params->selected_files.size();
        i < params->file_paths.size(); ++i) {
     const base::FilePath& file_path = params->file_paths[i];
     // When opening a drive file, we should get local file path.

[satorux1, 2013/08/06 02:07:17]

the comment needs to be updated? now need_local_path is also checked.

[kinaba, 2013/08/06 06:20:56]

Done.

     if (params->for_opening &&
+        params->need_local_path &&
         drive::util::IsUnderDriveMountPoint(file_path)) {
       drive::DriveIntegrationService* integration_service =
           drive::DriveIntegrationServiceFactory::GetForProfile(profile);
       // |integration_service| is NULL if Drive is disabled.
       if (!integration_service) {
         ContinueGetSelectedFileInfo(profile,
                                     params.Pass(),
                                     drive::FILE_ERROR_FAILED,
                                     base::FilePath(),
                                     scoped_ptr<drive::ResourceEntry>());
@@ skipping 84 matching lines @@
   base::FilePath path;
   if (!chromeos::FileSystemBackend::CanHandleURL(filesystem_url))
     return base::FilePath();
   return filesystem_url.path();
 }
 
 void GetSelectedFileInfo(content::RenderViewHost* render_view_host,
                          Profile* profile,
                          const std::vector<GURL>& file_urls,
                          bool for_opening,
+                         bool need_local_path,
                          GetSelectedFileInfoCallback callback) {
   DCHECK(render_view_host);
   DCHECK(profile);
 
   scoped_ptr<GetSelectedFileInfoParams> params(new GetSelectedFileInfoParams);
   params->for_opening = for_opening;
+  params->need_local_path = need_local_path;
   params->callback = callback;
 
   for (size_t i = 0; i < file_urls.size(); ++i) {
     const GURL& file_url = file_urls[i];
     const base::FilePath path = GetLocalPathFromURL(
         render_view_host, profile, file_url);
     if (!path.empty()) {
       DVLOG(1) << "Selected: file path: " << path.value();
       params->file_paths.push_back(path);
     }
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GetSelectedFileInfoInternal,
                  profile,
                  base::Passed(&params)));
 }
 
 }  // namespace util
 }  // namespace file_manager