Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / file_task_executor.cc

diff --git a/src/chrome/browser/chromeos/drive/file_task_executor.cc b/src/chrome/browser/chromeos/drive/file_task_executor.cc
index 86b45ce..7aaf7d3 100644 (file)
--- a/src/chrome/browser/chromeos/drive/file_task_executor.cc
+++ b/src/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -12,20 +12,62 @@
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
-using fileapi::FileSystemURL;
+using storage::FileSystemURL;
 
 namespace drive {
 
-FileTaskExecutor::FileTaskExecutor(Profile* profile,
-                                   const std::string& app_id)
-  : profile_(profile),
+namespace {
+
+class FileTaskExecutorDelegateImpl : public FileTaskExecutorDelegate {
+ public:
+  explicit FileTaskExecutorDelegateImpl(Profile* profile) : profile_(profile) {
+  }
+
+  virtual FileSystemInterface* GetFileSystem() OVERRIDE {
+    return util::GetFileSystemByProfile(profile_);
+  }
+
+  virtual DriveServiceInterface* GetDriveService() OVERRIDE {
+    return util::GetDriveServiceByProfile(profile_);
+  }
+
+  virtual void OpenBrowserWindow(const GURL& open_link) OVERRIDE {
+    chrome::ScopedTabbedBrowserDisplayer displayer(
+         profile_, chrome::HOST_DESKTOP_TYPE_ASH);
+    chrome::AddSelectedTabWithURL(displayer.browser(), open_link,
+                                  ui::PAGE_TRANSITION_LINK);
+    // Since the ScopedTabbedBrowserDisplayer does not guarantee that the
+    // browser will be shown on the active desktop, we ensure the visibility.
+    multi_user_util::MoveWindowToCurrentDesktop(
+        displayer.browser()->window()->GetNativeWindow());
+  }
+
+ private:
+  Profile* const profile_;
+};
+
+}  // namespace
+
+FileTaskExecutor::FileTaskExecutor(Profile* profile, const std::string& app_id)
+  : delegate_(new FileTaskExecutorDelegateImpl(profile)),
+    app_id_(app_id),
+    current_index_(0),
+    weak_ptr_factory_(this) {
+}
+
+FileTaskExecutor::FileTaskExecutor(
+    scoped_ptr<FileTaskExecutorDelegate> delegate,
+    const std::string& app_id)
+  : delegate_(delegate.Pass()),
     app_id_(app_id),
     current_index_(0),
     weak_ptr_factory_(this) {
@@ -37,6 +79,8 @@ FileTaskExecutor::~FileTaskExecutor() {
 void FileTaskExecutor::Execute(
     const std::vector<FileSystemURL>& file_urls,
     const file_manager::file_tasks::FileTaskFinishedCallback& done) {
+  DCHECK(!file_urls.empty());
+
   done_ = done;
 
   std::vector<base::FilePath> paths;
@@ -49,7 +93,7 @@ void FileTaskExecutor::Execute(
     paths.push_back(path);
   }
 
-  FileSystemInterface* file_system = util::GetFileSystemByProfile(profile_);
+  FileSystemInterface* const file_system = delegate_->GetFileSystem();
   if (!file_system) {
     Done(false);
     return;
@@ -60,7 +104,7 @@ void FileTaskExecutor::Execute(
   current_index_ = paths.size();
 
   for (size_t i = 0; i < paths.size(); ++i) {
-    file_system->GetResourceEntryByPath(
+    file_system->GetResourceEntry(
         paths[i],
         base::Bind(&FileTaskExecutor::OnFileEntryFetched,
                    weak_ptr_factory_.GetWeakPtr()));
@@ -73,9 +117,7 @@ void FileTaskExecutor::OnFileEntryFetched(FileError error,
   if (entry.get() && !entry->has_file_specific_info())
     error = FILE_ERROR_NOT_FOUND;
 
-  DriveServiceInterface* drive_service =
-      util::GetDriveServiceByProfile(profile_);
-
+  DriveServiceInterface* const drive_service = delegate_->GetDriveService();
   if (!drive_service || error != FILE_ERROR_OK) {
     Done(false);
     return;
@@ -96,22 +138,12 @@ void FileTaskExecutor::OnAppAuthorized(const std::string& resource_id,
                                        const GURL& open_link) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  DriveIntegrationService* service =
-      DriveIntegrationServiceFactory::FindForProfile(profile_);
-  if (!service || !service->IsMounted() ||
-      error != google_apis::HTTP_SUCCESS || open_link.is_empty()) {
+  if (error != google_apis::HTTP_SUCCESS || open_link.is_empty()) {
     Done(false);
     return;
   }
 
-  {
-    Profile* profile = profile_ ?
-        profile_ : ProfileManager::GetDefaultProfileOrOffTheRecord();
-    chrome::ScopedTabbedBrowserDisplayer displayer(
-         profile, chrome::HOST_DESKTOP_TYPE_ASH);
-    chrome::AddSelectedTabWithURL(displayer.browser(), open_link,
-                                  content::PAGE_TRANSITION_LINK);
-  }
+  delegate_->OpenBrowserWindow(open_link);
 
   // We're done with this file.  If this is the last one, then we're done.
   current_index_--;
@@ -123,7 +155,9 @@ void FileTaskExecutor::OnAppAuthorized(const std::string& resource_id,
 void FileTaskExecutor::Done(bool success) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!done_.is_null())
-    done_.Run(success);
+    done_.Run(success
+                  ? extensions::api::file_manager_private::TASK_RESULT_OPENED
+                  : extensions::api::file_manager_private::TASK_RESULT_FAILED);
   delete this;
 }