Revert 127317 - Implemented API for tracking ongoing file transfers from file manager.

chrome/browser/chromeos/extensions/file_browser_event_router.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_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/extensions/file_browser_notifications.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_dependency_manager.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 
 using chromeos::disks::DiskMountManager;
 using chromeos::disks::DiskMountManagerEventType;
 using content::BrowserThread;
-using gdata::GDataFileSystem;
-using gdata::GDataFileSystemFactory;
 
 namespace {
   const char kDiskAddedEventType[] = "added";
   const char kDiskRemovedEventType[] = "removed";
 
   const char kPathChanged[] = "changed";
   const char kPathWatchError[] = "error";
 
   DictionaryValue* DiskToDictionaryValue(
       const DiskMountManager::Disk* disk) {
@@ skipping 30 matching lines @@
     case chromeos::MOUNT_ERROR_NETWORK_ERROR:
       return "error_libcros_missing";
     case chromeos::MOUNT_ERROR_PATH_UNMOUNTED:
       return "error_path_unmounted";
     default:
       NOTREACHED();
   }
   return "";
 }
 
-FileBrowserEventRouter::FileBrowserEventRouter(
+ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter(
     Profile* profile)
-    : delegate_(new FileBrowserEventRouter::FileWatcherDelegate(this)),
+    : delegate_(new ExtensionFileBrowserEventRouter::FileWatcherDelegate(this)),
       notifications_(new FileBrowserNotifications(profile)),
       profile_(profile) {
 }
 
-FileBrowserEventRouter::~FileBrowserEventRouter() {
-}
-
-void FileBrowserEventRouter::Shutdown() {
+ExtensionFileBrowserEventRouter::~ExtensionFileBrowserEventRouter() {
   DCHECK(file_watchers_.empty());
   STLDeleteValues(&file_watchers_);
+
   if (!profile_) {
     NOTREACHED();
     return;
   }
+  profile_ = NULL;
   DiskMountManager::GetInstance()->RemoveObserver(this);
-
-  GDataFileSystem* file_system =
-      GDataFileSystemFactory::GetForProfile(profile_);
-  file_system->RemoveOperationObserver(this);
-
-  profile_ = NULL;
 }
 
-void FileBrowserEventRouter::ObserveFileSystemEvents() {
+void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents() {
   if (!profile_) {
     NOTREACHED();
     return;
   }
-  if (!chromeos::UserManager::Get()->IsUserLoggedIn())
-    return;
-
-  DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
-  disk_mount_manager->RemoveObserver(this);
-  disk_mount_manager->AddObserver(this);
-  disk_mount_manager->RequestMountInfoRefresh();
-
-  GDataFileSystem* file_system =
-      GDataFileSystemFactory::GetForProfile(profile_);
-  if (!file_system) {
-    NOTREACHED();
-    return;
+  if (chromeos::UserManager::Get()->IsUserLoggedIn()) {
+    DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
+    disk_mount_manager->RemoveObserver(this);
+    disk_mount_manager->AddObserver(this);
+    disk_mount_manager->RequestMountInfoRefresh();
   }
-  file_system->AddOperationObserver(this);
 }
 
 // File watch setup routines.
-bool FileBrowserEventRouter::AddFileWatch(
+bool ExtensionFileBrowserEventRouter::AddFileWatch(
     const FilePath& local_path,
     const FilePath& virtual_path,
     const std::string& extension_id) {
   base::AutoLock lock(lock_);
   WatcherMap::iterator iter = file_watchers_.find(local_path);
   if (iter == file_watchers_.end()) {
     scoped_ptr<FileWatcherExtensions>
         watch(new FileWatcherExtensions(virtual_path, extension_id));
 
     if (watch->Watch(local_path, delegate_.get()))
       file_watchers_[local_path] = watch.release();
     else
       return false;
   } else {
     iter->second->AddExtension(extension_id);
   }
   return true;
 }
 
-void FileBrowserEventRouter::RemoveFileWatch(
+void ExtensionFileBrowserEventRouter::RemoveFileWatch(
     const FilePath& local_path,
     const std::string& extension_id) {
   base::AutoLock lock(lock_);
   WatcherMap::iterator iter = file_watchers_.find(local_path);
   if (iter == file_watchers_.end())
     return;
   // Remove the renderer process for this watch.
   iter->second->RemoveExtension(extension_id);
   if (iter->second->GetRefCount() == 0) {
     delete iter->second;
     file_watchers_.erase(iter);
   }
 }
 
-void FileBrowserEventRouter::DiskChanged(
+void ExtensionFileBrowserEventRouter::DiskChanged(
     DiskMountManagerEventType event,
     const DiskMountManager::Disk* disk) {
   // Disregard hidden devices.
   if (disk->is_hidden())
     return;
   if (event == chromeos::disks::MOUNT_DISK_ADDED) {
     OnDiskAdded(disk);
   } else if (event == chromeos::disks::MOUNT_DISK_REMOVED) {
     OnDiskRemoved(disk);
   }
 }
 
-void FileBrowserEventRouter::DeviceChanged(
+void ExtensionFileBrowserEventRouter::DeviceChanged(
     DiskMountManagerEventType event,
     const std::string& device_path) {
   if (event == chromeos::disks::MOUNT_DEVICE_ADDED) {
     OnDeviceAdded(device_path);
   } else if (event == chromeos::disks::MOUNT_DEVICE_REMOVED) {
     OnDeviceRemoved(device_path);
   } else if (event == chromeos::disks::MOUNT_DEVICE_SCANNED) {
     OnDeviceScanned(device_path);
   } else if (event == chromeos::disks::MOUNT_FORMATTING_STARTED) {
   // TODO(tbarzic): get rid of '!'.
     if (device_path[0] == '!') {
       OnFormattingStarted(device_path.substr(1), false);
     } else {
       OnFormattingStarted(device_path, true);
     }
   } else if (event == chromeos::disks::MOUNT_FORMATTING_FINISHED) {
     if (device_path[0] == '!') {
       OnFormattingFinished(device_path.substr(1), false);
     } else {
       OnFormattingFinished(device_path, true);
     }
   }
 }
 
-void FileBrowserEventRouter::MountCompleted(
+void ExtensionFileBrowserEventRouter::MountCompleted(
     DiskMountManager::MountEvent event_type,
     chromeos::MountError error_code,
     const DiskMountManager::MountPointInfo& mount_info) {
   DispatchMountCompletedEvent(event_type, error_code, mount_info);
 
   if (mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
       event_type == DiskMountManager::MOUNTING) {
     DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
     DiskMountManager::DiskMap::const_iterator disk_it =
         disk_mount_manager->disks().find(mount_info.source_path);
     if (disk_it == disk_mount_manager->disks().end()) {
       return;
     }
     DiskMountManager::Disk* disk = disk_it->second;
 
      notifications_->ManageNotificationsOnMountCompleted(
         disk->system_path_prefix(), disk->drive_label(), disk->is_parent(),
         error_code == chromeos::MOUNT_ERROR_NONE,
         error_code == chromeos::MOUNT_ERROR_UNSUPORTED_FILESYSTEM);
   }
 }
 
-void FileBrowserEventRouter::OnProgressUpdate(
-    const std::vector<gdata::GDataOperationRegistry::ProgressStatus>& list) {
-  scoped_ptr<ListValue> event_list(
-      file_manager_util::ProgressStatusVectorToListValue(
-          profile_,
-          file_manager_util::GetFileBrowserExtensionUrl().GetOrigin(),
-          list));
-
-  std::string args_json;
-  base::JSONWriter::Write(event_list.get(),
-                          &args_json);
-
-  profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-      std::string(kFileBrowserDomain),
-      extension_event_names::kOnFileTransfersUpdated, args_json,
-      NULL, GURL());
-}
-
-
-void FileBrowserEventRouter::HandleFileWatchNotification(
+void ExtensionFileBrowserEventRouter::HandleFileWatchNotification(
     const FilePath& local_path, bool got_error) {
   base::AutoLock lock(lock_);
   WatcherMap::const_iterator iter = file_watchers_.find(local_path);
   if (iter == file_watchers_.end()) {
     NOTREACHED();
     return;
   }
   DispatchFolderChangeEvent(iter->second->GetVirtualPath(), got_error,
                             iter->second->GetExtensions());
 }
 
-void FileBrowserEventRouter::DispatchFolderChangeEvent(
+void ExtensionFileBrowserEventRouter::DispatchFolderChangeEvent(
     const FilePath& virtual_path, bool got_error,
-    const FileBrowserEventRouter::ExtensionUsageRegistry& extensions) {
+    const ExtensionFileBrowserEventRouter::ExtensionUsageRegistry& extensions) {
   if (!profile_) {
     NOTREACHED();
     return;
   }
 
   for (ExtensionUsageRegistry::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     GURL target_origin_url(Extension::GetBaseURLFromExtensionId(
         iter->first));
     GURL base_url = fileapi::GetFileSystemRootURI(target_origin_url,
         fileapi::kFileSystemTypeExternal);
     GURL target_file_url = GURL(base_url.spec() + virtual_path.value());
     ListValue args;
     DictionaryValue* watch_info = new DictionaryValue();
     args.Append(watch_info);
     watch_info->SetString("fileUrl", target_file_url.spec());
     watch_info->SetString("eventType",
                           got_error ? kPathWatchError : kPathChanged);
 
     std::string args_json;
     base::JSONWriter::Write(&args, &args_json);
 
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
         iter->first, extension_event_names::kOnFileChanged, args_json,
         NULL, GURL());
   }
 }
 
-void FileBrowserEventRouter::DispatchDiskEvent(
+void ExtensionFileBrowserEventRouter::DispatchDiskEvent(
     const DiskMountManager::Disk* disk, bool added) {
   if (!profile_) {
     NOTREACHED();
     return;
   }
 
   ListValue args;
   DictionaryValue* mount_info = new DictionaryValue();
   args.Append(mount_info);
   mount_info->SetString("eventType",
                         added ? kDiskAddedEventType : kDiskRemovedEventType);
   DictionaryValue* disk_info = DiskToDictionaryValue(disk);
   mount_info->Set("volumeInfo", disk_info);
 
   std::string args_json;
   base::JSONWriter::Write(&args, &args_json);
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       extension_event_names::kOnFileBrowserDiskChanged, args_json, NULL,
       GURL());
 }
 
-void FileBrowserEventRouter::DispatchMountCompletedEvent(
+void ExtensionFileBrowserEventRouter::DispatchMountCompletedEvent(
     DiskMountManager::MountEvent event,
     chromeos::MountError error_code,
     const DiskMountManager::MountPointInfo& mount_info) {
   if (!profile_ || mount_info.mount_type == chromeos::MOUNT_TYPE_INVALID) {
     NOTREACHED();
     return;
   }
 
   ListValue args;
   DictionaryValue* mount_info_value = new DictionaryValue();
@@ skipping 43 matching lines @@
       GURL());
 
   if (relative_mount_path_set &&
       mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
       !mount_info.mount_condition &&
       event == DiskMountManager::MOUNTING) {
     file_manager_util::ViewRemovableDrive(FilePath(mount_info.mount_path));
   }
 }
 
-void FileBrowserEventRouter::OnDiskAdded(
+void ExtensionFileBrowserEventRouter::OnDiskAdded(
     const DiskMountManager::Disk* disk) {
   VLOG(1) << "Disk added: " << disk->device_path();
   if (disk->device_path().empty()) {
     VLOG(1) << "Empty system path for " << disk->device_path();
     return;
   }
 
   // If disk is not mounted yet, give it a try.
   if (disk->mount_path().empty()) {
     // Initiate disk mount operation.
     DiskMountManager::GetInstance()->MountPath(
         disk->device_path(), chromeos::MOUNT_TYPE_DEVICE);
   }
   DispatchDiskEvent(disk, true);
 }
 
-void FileBrowserEventRouter::OnDiskRemoved(
+void ExtensionFileBrowserEventRouter::OnDiskRemoved(
     const DiskMountManager::Disk* disk) {
   VLOG(1) << "Disk removed: " << disk->device_path();
 
   if (!disk->mount_path().empty()) {
     DiskMountManager::GetInstance()->UnmountPath(disk->mount_path());
   }
   DispatchDiskEvent(disk, false);
 }
 
-void FileBrowserEventRouter::OnDeviceAdded(
+void ExtensionFileBrowserEventRouter::OnDeviceAdded(
     const std::string& device_path) {
   VLOG(1) << "Device added : " << device_path;
 
   notifications_->RegisterDevice(device_path);
   notifications_->ShowNotificationDelayed(FileBrowserNotifications::DEVICE,
                                           device_path,
                                           4000);
 }
 
-void FileBrowserEventRouter::OnDeviceRemoved(
+void ExtensionFileBrowserEventRouter::OnDeviceRemoved(
     const std::string& device_path) {
   VLOG(1) << "Device removed : " << device_path;
   notifications_->HideNotification(FileBrowserNotifications::DEVICE,
                                    device_path);
   notifications_->HideNotification(FileBrowserNotifications::DEVICE_FAIL,
                                    device_path);
   notifications_->UnregisterDevice(device_path);
 }
 
-void FileBrowserEventRouter::OnDeviceScanned(
+void ExtensionFileBrowserEventRouter::OnDeviceScanned(
     const std::string& device_path) {
   VLOG(1) << "Device scanned : " << device_path;
 }
 
-void FileBrowserEventRouter::OnFormattingStarted(
+void ExtensionFileBrowserEventRouter::OnFormattingStarted(
     const std::string& device_path, bool success) {
   if (success) {
     notifications_->ShowNotification(FileBrowserNotifications::FORMAT_START,
                                      device_path);
   } else {
     notifications_->ShowNotification(
         FileBrowserNotifications::FORMAT_START_FAIL, device_path);
   }
 }
 
-void FileBrowserEventRouter::OnFormattingFinished(
+void ExtensionFileBrowserEventRouter::OnFormattingFinished(
     const std::string& device_path, bool success) {
   if (success) {
     notifications_->HideNotification(FileBrowserNotifications::FORMAT_START,
                                      device_path);
     notifications_->ShowNotification(FileBrowserNotifications::FORMAT_SUCCESS,
                                      device_path);
     // Hide it after a couple of seconds.
     notifications_->HideNotificationDelayed(
         FileBrowserNotifications::FORMAT_SUCCESS, device_path, 4000);
 
     DiskMountManager::GetInstance()->MountPath(device_path,
                                                chromeos::MOUNT_TYPE_DEVICE);
   } else {
     notifications_->HideNotification(FileBrowserNotifications::FORMAT_START,
                                      device_path);
     notifications_->ShowNotification(FileBrowserNotifications::FORMAT_FAIL,
                                      device_path);
   }
 }
 
-// FileBrowserEventRouter::WatcherDelegate methods.
-FileBrowserEventRouter::FileWatcherDelegate::FileWatcherDelegate(
-    FileBrowserEventRouter* router) : router_(router) {
+// ExtensionFileBrowserEventRouter::WatcherDelegate methods.
+ExtensionFileBrowserEventRouter::FileWatcherDelegate::FileWatcherDelegate(
+    ExtensionFileBrowserEventRouter* router) : router_(router) {
 }
 
-void FileBrowserEventRouter::FileWatcherDelegate::OnFilePathChanged(
+void ExtensionFileBrowserEventRouter::FileWatcherDelegate::OnFilePathChanged(
     const FilePath& local_path) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&FileWatcherDelegate::HandleFileWatchOnUIThread,
                  this, local_path, false));
 }
 
-void FileBrowserEventRouter::FileWatcherDelegate::OnFilePathError(
+void ExtensionFileBrowserEventRouter::FileWatcherDelegate::OnFilePathError(
     const FilePath& local_path) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
           base::Bind(&FileWatcherDelegate::HandleFileWatchOnUIThread,
                      this, local_path, true));
 }
 
 void
-FileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread(
+ExtensionFileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread(
      const FilePath& local_path, bool got_error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   router_->HandleFileWatchNotification(local_path, got_error);
 }
 
 
-FileBrowserEventRouter::FileWatcherExtensions::FileWatcherExtensions(
+ExtensionFileBrowserEventRouter::FileWatcherExtensions::FileWatcherExtensions(
     const FilePath& path, const std::string& extension_id)
     : ref_count(0) {
   file_watcher.reset(new base::files::FilePathWatcher());
   virtual_path = path;
   AddExtension(extension_id);
 }
 
-void FileBrowserEventRouter::FileWatcherExtensions::AddExtension(
+void ExtensionFileBrowserEventRouter::FileWatcherExtensions::AddExtension(
     const std::string& extension_id) {
   ExtensionUsageRegistry::iterator it = extensions.find(extension_id);
   if (it != extensions.end()) {
     it->second++;
   } else {
     extensions.insert(ExtensionUsageRegistry::value_type(extension_id, 1));
   }
 
   ref_count++;
 }
 
-void FileBrowserEventRouter::FileWatcherExtensions::RemoveExtension(
+void ExtensionFileBrowserEventRouter::FileWatcherExtensions::RemoveExtension(
     const std::string& extension_id) {
   ExtensionUsageRegistry::iterator it = extensions.find(extension_id);
 
   if (it != extensions.end()) {
     // If entry found - decrease it's count and remove if necessary
     if (0 == it->second--) {
       extensions.erase(it);
     }
 
     ref_count--;
   } else {
     // Might be reference counting problem - e.g. if some component of
     // extension subscribes/unsubscribes correctly, but other component
     // only unsubscribes, developer of first one might receive this message
     LOG(FATAL) << " Extension [" << extension_id
         << "] tries to unsubscribe from folder [" << local_path.value()
         << "] it isn't subscribed";
   }
 }
 
-const FileBrowserEventRouter::ExtensionUsageRegistry&
-FileBrowserEventRouter::FileWatcherExtensions::GetExtensions() const {
+const ExtensionFileBrowserEventRouter::ExtensionUsageRegistry&
+ExtensionFileBrowserEventRouter::FileWatcherExtensions::GetExtensions() const {
   return extensions;
 }
 
 unsigned int
-FileBrowserEventRouter::FileWatcherExtensions::GetRefCount() const {
+ExtensionFileBrowserEventRouter::FileWatcherExtensions::GetRefCount() const {
   return ref_count;
 }
 
 const FilePath&
-FileBrowserEventRouter::FileWatcherExtensions::GetVirtualPath() const {
+ExtensionFileBrowserEventRouter::FileWatcherExtensions::GetVirtualPath() const {
   return virtual_path;
 }
 
-bool FileBrowserEventRouter::FileWatcherExtensions::Watch
+bool ExtensionFileBrowserEventRouter::FileWatcherExtensions::Watch
     (const FilePath& path, FileWatcherDelegate* delegate) {
   return file_watcher->Watch(path, delegate);
 }
-
-// static
-FileBrowserEventRouter*
-FileBrowserEventRouterFactory::GetForProfile(Profile* profile) {
-  return static_cast<FileBrowserEventRouter*>(
-      GetInstance()->GetServiceForProfile(profile, true));
-}
-
-// static
-FileBrowserEventRouterFactory*
-FileBrowserEventRouterFactory::GetInstance() {
-  return Singleton<FileBrowserEventRouterFactory>::get();
-}
-
-FileBrowserEventRouterFactory::FileBrowserEventRouterFactory()
-    : ProfileKeyedServiceFactory("FileBrowserEventRouter",
-                                 ProfileDependencyManager::GetInstance()) {
-  DependsOn(GDataFileSystemFactory::GetInstance());
-}
-
-FileBrowserEventRouterFactory::~FileBrowserEventRouterFactory() {
-}
-
-ProfileKeyedService* FileBrowserEventRouterFactory::BuildServiceInstanceFor(
-    Profile* profile) const {
-  return new FileBrowserEventRouter(profile);
-}