Revert Revert 94812 - Formatting feature initial commit for ChromeOS Tree

chrome/browser/chromeos/extensions/file_browser_event_router.cc

Index: chrome/browser/chromeos/extensions/file_browser_event_router.cc
===================================================================
--- chrome/browser/chromeos/extensions/file_browser_event_router.cc	(revision 96422)
+++ chrome/browser/chromeos/extensions/file_browser_event_router.cc	(working copy)
@@ -4,7 +4,10 @@
 
 #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"
@@ -23,24 +26,38 @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 
-const char kDiskAddedEventType[] = "added";
-const char kDiskRemovedEventType[] = "removed";
+namespace {
+  const char kDiskAddedEventType[] = "added";
+  const char kDiskRemovedEventType[] = "removed";
 
-const char kPathChanged[] = "changed";
-const char kPathWatchError[] = "error";
+  const char kPathChanged[] = "changed";
+  const char kPathWatchError[] = "error";
 
-const char* DeviceTypeToString(chromeos::DeviceType type) {
-  switch (type) {
-    case chromeos::FLASH:
-      return "flash";
-    case chromeos::HDD:
-      return "hdd";
-    case chromeos::OPTICAL:
-      return "optical";
-    default:
-      break;
+  const char* DeviceTypeToString(chromeos::DeviceType type) {
+    switch (type) {
+      case chromeos::FLASH:
+        return "flash";
+      case chromeos::HDD:
+        return "hdd";
+      case chromeos::OPTICAL:
+        return "optical";
+      default:
+        break;
+    }
+    return "undefined";
   }
-  return "undefined";
+
+  DictionaryValue* DiskToDictionaryValue(
+      const chromeos::MountLibrary::Disk* disk) {
+    DictionaryValue* result = new DictionaryValue();
+    result->SetString("mountPath", disk->mount_path());
+    result->SetString("devicePath", disk->device_path());
+    result->SetString("label", disk->device_label());
+    result->SetString("deviceType", DeviceTypeToString(disk->device_type()));
+    result->SetInteger("totalSizeKB", disk->total_size() / 1024);
+    result->SetBoolean("readOnly", disk->is_read_only());
+    return result;
+  }
 }
 
 const char* MountErrorToString(chromeos::MountError error) {
@@ -65,16 +82,9 @@
   return "";
 }
 
-DictionaryValue* DiskToDictionaryValue(
-    const chromeos::MountLibrary::Disk* disk) {
-  DictionaryValue* result = new DictionaryValue();
-  result->SetString("mountPath", disk->mount_path());
-  result->SetString("devicePath", disk->device_path());
-  result->SetString("label", disk->device_label());
-  result->SetString("deviceType", DeviceTypeToString(disk->device_type()));
-  result->SetInteger("totalSizeKB", disk->total_size() / 1024);
-  result->SetBoolean("readOnly", disk->is_read_only());
-  return result;
+void HideFileBrowserNotificationExternally(const std::string& category,
+    const std::string& system_path, ExtensionFileBrowserEventRouter* that) {
+  that->HideFileBrowserNotification(category, system_path);
 }
 
 ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter(
@@ -171,6 +181,10 @@
     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(
@@ -181,24 +195,30 @@
       event_type == chromeos::MountLibrary::MOUNTING) {
     chromeos::MountLibrary* mount_lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
+    if (mount_lib->disks().find(mount_info.source_path) ==
+        mount_lib->disks().end()) {
+      return;
+    }
     chromeos::MountLibrary::Disk* disk =
         mount_lib->disks().find(mount_info.source_path)->second;
 
     if (!error_code) {
-      HideDeviceNotification(disk->system_path());
+      HideFileBrowserNotification("MOUNT", disk->system_path());
     } else {
-      HideDeviceNotification(disk->system_path());
+      HideFileBrowserNotification("MOUNT", disk->system_path());
       if (!disk->drive_label().empty()) {
-        ShowDeviceNotification(disk->system_path(),
+        ShowFileBrowserNotification("MOUNT", disk->system_path(),
             IDR_PAGEINFO_INFO,
+            l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE),
             // TODO(tbarzic): Find more suitable message.
             l10n_util::GetStringFUTF16(
                 IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED,
                 ASCIIToUTF16(disk->drive_label()),
                 ASCIIToUTF16(MountErrorToString(error_code))));
       } else {
-        ShowDeviceNotification(disk->system_path(),
+        ShowFileBrowserNotification("MOUNT", disk->system_path(),
             IDR_PAGEINFO_INFO,
+            l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE),
             // TODO(tbarzic): Find more suitable message.
             l10n_util::GetStringFUTF16(
                 IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED,
@@ -334,7 +354,7 @@
   if (relative_mount_path_set &&
       mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
       event == chromeos::MountLibrary::MOUNTING) {
-    FileManagerUtil::ShowFullTabUrl(profile_, relative_mount_path);
+    FileManagerUtil::ShowFullTabUrl(profile_, FilePath(mount_info.mount_path));
   }
 }
 
@@ -361,7 +381,7 @@
 void ExtensionFileBrowserEventRouter::OnDiskRemoved(
     const chromeos::MountLibrary::Disk* disk) {
   VLOG(1) << "Disk removed: " << disk->device_path();
-  HideDeviceNotification(disk->system_path());
+  HideFileBrowserNotification("MOUNT", disk->system_path());
 
   if (!disk->mount_path().empty()) {
     chromeos::MountLibrary* lib =
@@ -375,14 +395,14 @@
     const std::string& device_path) {
   VLOG(1) << "Device added : " << device_path;
   // TODO(zelidrag): Find better icon here.
-  ShowDeviceNotification(device_path, IDR_PAGEINFO_INFO,
+  ShowFileBrowserNotification("MOUNT", device_path, IDR_PAGEINFO_INFO,
+      l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE),
       l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_SCANNING_MESSAGE));
-
 }
 
 void ExtensionFileBrowserEventRouter::OnDeviceRemoved(
     const std::string& system_path) {
-  HideDeviceNotification(system_path);
+  HideFileBrowserNotification("MOUNT", system_path);
 }
 
 void ExtensionFileBrowserEventRouter::OnDeviceScanned(
@@ -390,33 +410,75 @@
   VLOG(1) << "Device scanned : " << device_path;
 }
 
-void ExtensionFileBrowserEventRouter::ShowDeviceNotification(
-    const std::string& system_path, int icon_resource_id,
-    const string16& message) {
-  NotificationMap::iterator iter = FindNotificationForPath(system_path);
-  std::string mount_path;
-  if (iter != notifications_.end()) {
-    iter->second->Show(message, false, false);
+void ExtensionFileBrowserEventRouter::OnFormattingStarted(
+    const std::string& device_path) {
+  if (device_path[0] == '!') {
+    ShowFileBrowserNotification("FORMAT_FINISHED", device_path.substr(1),
+        IDR_PAGEINFO_WARNING_MAJOR,
+        l10n_util::GetStringUTF16(IDS_FORMATTING_OF_DEVICE_FINISHED_TITLE),
+        l10n_util::GetStringUTF16(IDS_FORMATTING_STARTED_FAILURE_MESSAGE));
   } else {
-    if (!profile_) {
-      NOTREACHED();
-      return;
-    }
-    chromeos::SystemNotification* notification =
-        new chromeos::SystemNotification(
-            profile_,
-            system_path,
-            icon_resource_id,
-            l10n_util::GetStringUTF16(IDS_REMOVABLE_DEVICE_DETECTION_TITLE));
-    notifications_.insert(NotificationMap::value_type(system_path,
-        linked_ptr<chromeos::SystemNotification>(notification)));
-    notification->Show(message, false, false);
+    ShowFileBrowserNotification("FORMAT", device_path, IDR_PAGEINFO_INFO,
+        l10n_util::GetStringUTF16(IDS_FORMATTING_OF_DEVICE_PENDING_TITLE),
+        l10n_util::GetStringUTF16(IDS_FORMATTING_OF_DEVICE_PENDING_MESSAGE));
   }
 }
 
-void ExtensionFileBrowserEventRouter::HideDeviceNotification(
-    const std::string& system_path) {
-  NotificationMap::iterator iter = FindNotificationForPath(system_path);
+void ExtensionFileBrowserEventRouter::OnFormattingFinished(
+    const std::string& device_path) {
+  if (device_path[0] == '!') {
+    HideFileBrowserNotification("FORMAT", device_path.substr(1));
+    ShowFileBrowserNotification("FORMAT_FINISHED", device_path.substr(1),
+        IDR_PAGEINFO_WARNING_MAJOR,
+        l10n_util::GetStringUTF16(IDS_FORMATTING_OF_DEVICE_FINISHED_TITLE),
+        l10n_util::GetStringUTF16(IDS_FORMATTING_FINISHED_FAILURE_MESSAGE));
+  } else {
+    HideFileBrowserNotification("FORMAT", device_path);
+    ShowFileBrowserNotification("FORMAT_FINISHED", device_path,
+        IDR_PAGEINFO_INFO,
+        l10n_util::GetStringUTF16(IDS_FORMATTING_OF_DEVICE_FINISHED_TITLE),
+        l10n_util::GetStringUTF16(IDS_FORMATTING_FINISHED_SUCCESS_MESSAGE));
+    // Hide it after a couple of seconds
+    MessageLoop::current()->PostDelayedTask(FROM_HERE,
+        base::Bind(&HideFileBrowserNotificationExternally, "FORMAT_FINISHED",
+        device_path, this),
+        4000);
+
+    chromeos::MountLibrary* lib =
+        chromeos::CrosLibrary::Get()->GetMountLibrary();
+    lib->MountPath(device_path.c_str(),
+                   chromeos::MOUNT_TYPE_DEVICE,
+                   chromeos::MountPathOptions());  // Unused.
+  }
+}
+
+void ExtensionFileBrowserEventRouter::ShowFileBrowserNotification(
+        const std::string& category, const std::string& system_path,
+        int icon_resource_id, const string16& title, const string16& message) {
+  std::string notification_id = category + system_path;
+  // New notification always created because, it might have been closed by now.
+  NotificationMap::iterator iter = FindNotificationForId(notification_id);
+  if (iter != notifications_.end())
+    notifications_.erase(iter);
+  if (!profile_) {
+    NOTREACHED();
+    return;
+  }
+  chromeos::SystemNotification* notification =
+      new chromeos::SystemNotification(
+          profile_,
+          notification_id,
+          icon_resource_id,
+          title);
+  notifications_.insert(NotificationMap::value_type(notification_id,
+      linked_ptr<chromeos::SystemNotification>(notification)));
+  notification->Show(message, false, false);
+}
+
+void ExtensionFileBrowserEventRouter::HideFileBrowserNotification(
+    const std::string& category, const std::string& system_path) {
+  NotificationMap::iterator iter = FindNotificationForId(
+      category + system_path);
   if (iter != notifications_.end()) {
     iter->second->Hide();
     notifications_.erase(iter);
@@ -424,15 +486,15 @@
 }
 
 ExtensionFileBrowserEventRouter::NotificationMap::iterator
-    ExtensionFileBrowserEventRouter::FindNotificationForPath(
-        const std::string& system_path) {
+    ExtensionFileBrowserEventRouter::FindNotificationForId(
+        const std::string& notification_id) {
   for (NotificationMap::iterator iter = notifications_.begin();
        iter != notifications_.end();
        ++iter) {
     const std::string& notification_device_path = iter->first;
     // Doing a sub string match so that we find if this new one is a subdevice
     // of another already inserted device.
-    if (StartsWithASCII(system_path, notification_device_path, true)) {
+    if (StartsWithASCII(notification_id, notification_device_path, true)) {
       return iter;
     }
   }