Some filebrowser bugs and retiring DiskChanged event in filebrowser

chrome/browser/chromeos/extensions/file_browser_event_router.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/chromeos/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/notifications/system_notification.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/extensions/file_manager_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/browser_thread.h"
@@ skipping 139 matching lines @@
   }
 }
 
 void ExtensionFileBrowserEventRouter::DiskChanged(
     chromeos::MountLibraryEventType event,
     const chromeos::MountLibrary::Disk* disk) {
   if (event == chromeos::MOUNT_DISK_ADDED) {
     OnDiskAdded(disk);
   } else if (event == chromeos::MOUNT_DISK_REMOVED) {
     OnDiskRemoved(disk);
-  } else if (event == chromeos::MOUNT_DISK_CHANGED) {
-    OnDiskChanged(disk);
   }
 }
 
 void ExtensionFileBrowserEventRouter::DeviceChanged(
     chromeos::MountLibraryEventType event,
     const std::string& device_path) {
   if (event == chromeos::MOUNT_DEVICE_ADDED) {
     OnDeviceAdded(device_path);
   } else if (event == chromeos::MOUNT_DEVICE_REMOVED) {
     OnDeviceRemoved(device_path);
   } else if (event == chromeos::MOUNT_DEVICE_SCANNED) {
     OnDeviceScanned(device_path);
   } else if (event == chromeos::MOUNT_FORMATTING_STARTED) {
     OnFormattingStarted(device_path);
   } else if (event == chromeos::MOUNT_FORMATTING_FINISHED) {
     OnFormattingFinished(device_path);
   }
 }
 void ExtensionFileBrowserEventRouter::MountCompleted(
     chromeos::MountLibrary::MountEvent event_type,
     chromeos::MountError error_code,
     const chromeos::MountLibrary::MountPointInfo& mount_info) {
+  if (mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
+      event_type == chromeos::MountLibrary::MOUNTING) {
+    chromeos::MountLibrary* mount_lib =
+        chromeos::CrosLibrary::Get()->GetMountLibrary();
+    chromeos::MountLibrary::Disk* disk =
+        mount_lib->disks().find(mount_info.source_path)->second;
+
+    if (!error_code) {
+      HideFileBrowserNotification("MOUNT", disk->system_path());
+    } else if (error_code == chromeos::MOUNT_ERROR_UNSUPORTED_FILESYSTEM) {
+      HideFileBrowserNotification("MOUNT", disk->system_path());
+      if (!disk->drive_label().empty()) {
+        ShowFileBrowserNotification("MOUNT", disk->system_path(),
+            IDR_PAGEINFO_INFO,
+            l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE),
+            l10n_util::GetStringFUTF16(IDS_DEVICE_UNSUPPORTED_MESSAGE,
+                                       ASCIIToUTF16(disk->drive_label())));
+       } else {
+        ShowFileBrowserNotification("MOUNT", disk->system_path(),
+            IDR_PAGEINFO_INFO,
+            l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE),
+            l10n_util::GetStringUTF16(IDS_DEVICE_UNSUPPORTED_DEFAULT_MESSAGE));
+       }
+    }
+  }
+
   DispatchMountCompletedEvent(event_type, error_code, mount_info);
 }
 
 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;
@@ skipping 26 matching lines @@
 
     std::string args_json;
     base::JSONWriter::Write(&args, false /* pretty_print */, &args_json);
 
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
         *iter, extension_event_names::kOnFileChanged, args_json,
         NULL, GURL());
   }
 }
 
-void ExtensionFileBrowserEventRouter::DispatchMountEvent(
+void ExtensionFileBrowserEventRouter::DispatchDiskEvent(
     const chromeos::MountLibrary::Disk* disk, bool added) {
   if (!profile_) {
     NOTREACHED();
     return;
   }
 
   ListValue args;
   DictionaryValue* mount_info = new DictionaryValue();
   args.Append(mount_info);
   mount_info->SetString("eventType",
@@ skipping 34 matching lines @@
     if (FileManagerUtil::ConvertFileToFileSystemUrl(profile_,
             FilePath(mount_info.source_path),
             FileManagerUtil::GetFileBrowserExtensionUrl().GetOrigin(),
             &source_url)) {
       mount_info_value->SetString("sourceUrl", source_url.spec());
     }
   } else {
     mount_info_value->SetString("sourceUrl", mount_info.source_path);
   }
 
+  FilePath relative_mount_path;
+  bool relative_mount_path_set = false;
   // If there were no error, add mountPath to the event.
   if (error_code == chromeos::MOUNT_ERROR_NONE) {
-    FilePath relative_mount_path;
     // Convert mount point path to relative path with the external file system
     // exposed within File API.
     if (FileManagerUtil::ConvertFileToRelativeFileSystemPath(profile_,
             FilePath(mount_info.mount_path),
             &relative_mount_path)) {
-      mount_info_value->SetString("mountPath", relative_mount_path.value());
+      mount_info_value->SetString("mountPath",
+                                  "/" + relative_mount_path.value());
+      relative_mount_path_set = true;
     }
   }
 
   std::string args_json;
   base::JSONWriter::Write(&args, false /* pretty_print */, &args_json);
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       extension_event_names::kOnFileBrowserMountCompleted, args_json, NULL,
       GURL());
+
+  if (relative_mount_path_set &&
+      mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
+      event == chromeos::MountLibrary::MOUNTING) {
+    FileManagerUtil::ShowFullTabUrl(profile_, relative_mount_path);
+  }
 }
 
 void ExtensionFileBrowserEventRouter::OnDiskAdded(
     const chromeos::MountLibrary::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_parent()) {
-    if (!disk->has_media()) {
-      HideFileBrowserNotification("MOUNT", disk->system_path());
-      return;
-    }
-  }
 
   // If disk is not mounted yet, give it a try.
   if (disk->mount_path().empty()) {
     // Initiate disk mount operation.
     chromeos::MountLibrary* lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
     lib->MountPath(disk->device_path().c_str(),
                    chromeos::MOUNT_TYPE_DEVICE,
                    chromeos::MountPathOptions());  // Unused.
   }
-  DispatchMountEvent(disk, true);
+  DispatchDiskEvent(disk, true);
 }
 
 void ExtensionFileBrowserEventRouter::OnDiskRemoved(
     const chromeos::MountLibrary::Disk* disk) {
   VLOG(1) << "Disk removed: " << disk->device_path();
   HideFileBrowserNotification("MOUNT", disk->system_path());
-  MountPointMap::iterator iter = mounted_devices_.find(disk->device_path());
-  if (iter == mounted_devices_.end())
-    return;
 
-  chromeos::MountLibrary* lib =
-      chromeos::CrosLibrary::Get()->GetMountLibrary();
-  // TODO(zelidrag): This for some reason does not work as advertized.
-  // we might need to clean up mount directory on FILE thread here as well.
-  lib->UnmountPath(disk->device_path().c_str());
-  DispatchMountEvent(disk, false);
-  mounted_devices_.erase(iter);
-}
-
-void ExtensionFileBrowserEventRouter::OnDiskChanged(
-    const chromeos::MountLibrary::Disk* disk) {
-  VLOG(1) << "Disk changed : " << disk->device_path();
   if (!disk->mount_path().empty()) {
-    HideFileBrowserNotification("MOUNT", disk->system_path());
-    // Remember this mount point.
-    if (mounted_devices_.find(disk->device_path()) == mounted_devices_.end()) {
-      mounted_devices_.insert(
-          std::pair<std::string, std::string>(disk->device_path(),
-                                              disk->mount_path()));
-      DispatchMountEvent(disk, true);
-      HideFileBrowserNotification("MOUNT", disk->system_path());
-      FileManagerUtil::ShowFullTabUrl(profile_, FilePath(disk->mount_path()));
-    }
+    chromeos::MountLibrary* lib =
+       chromeos::CrosLibrary::Get()->GetMountLibrary();
+    lib->UnmountPath(disk->mount_path().c_str());
   }
+  DispatchDiskEvent(disk, false);
 }
 
 void ExtensionFileBrowserEventRouter::OnDeviceAdded(
     const std::string& device_path) {
   VLOG(1) << "Device added : " << device_path;
   // TODO(zelidrag): Find better icon here.
   ShowFileBrowserNotification("MOUNT", device_path, IDR_PAGEINFO_INFO,
       l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE),
       l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_SCANNING_MESSAGE));
 }
@@ skipping 122 matching lines @@
           &FileWatcherDelegate::HandleFileWatchOnUIThread,
           local_path,
           true));     // got_error
 }
 
 void
 ExtensionFileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread(
      const FilePath& local_path, bool got_error) {
   router_->HandleFileWatchNotification(local_path, got_error);
 }