Revert Revert 94812 - Formatting feature initial commit for ChromeOS Tree

chrome/browser/chromeos/extensions/file_browser_event_router.h

Index: chrome/browser/chromeos/extensions/file_browser_event_router.h
===================================================================
--- chrome/browser/chromeos/extensions/file_browser_event_router.h	(revision 96422)
+++ chrome/browser/chromeos/extensions/file_browser_event_router.h	(working copy)
@@ -27,6 +27,11 @@
 // found.
 class ExtensionFileBrowserEventRouter
     : public chromeos::MountLibrary::Observer {
+
+  friend void HideFileBrowserNotificationExternally(
+      const std::string& category, const std::string& system_path,
+      ExtensionFileBrowserEventRouter* that);
+
  public:
   explicit ExtensionFileBrowserEventRouter(Profile* profile);
   virtual ~ExtensionFileBrowserEventRouter();
@@ -87,13 +92,17 @@
   // USB mount event handlers.
   void OnDiskAdded(const chromeos::MountLibrary::Disk* disk);
   void OnDiskRemoved(const chromeos::MountLibrary::Disk* disk);
+  void OnDiskMounted(const chromeos::MountLibrary::Disk* disk);
+  void OnDiskUnmounted(const chromeos::MountLibrary::Disk* disk);
   void OnDeviceAdded(const std::string& device_path);
   void OnDeviceRemoved(const std::string& device_path);
   void OnDeviceScanned(const std::string& device_path);
+  void OnFormattingStarted(const std::string& device_path);
+  void OnFormattingFinished(const std::string& device_path);
 
   // Finds first notifications corresponding to the same device. Ensures that
   // we don't pop up multiple notifications for the same device.
-  NotificationMap::iterator FindNotificationForPath(const std::string& path);
+  NotificationMap::iterator FindNotificationForId(const std::string& path);
 
   // Process file watch notifications.
   void HandleFileWatchNotification(const FilePath& path,
@@ -119,10 +128,13 @@
                       bool small);
 
   // Show/hide desktop notifications.
-  void ShowDeviceNotification(const std::string& system_path,
-                              int icon_resource_id,
-                              const string16& message);
-  void HideDeviceNotification(const std::string& system_path);
+  void ShowFileBrowserNotification(const std::string& category,
+                                   const std::string& system_path,
+                                   int icon_resource_id,
+                                   const string16& title,
+                                   const string16& message);
+  void HideFileBrowserNotification(const std::string& category,
+                                   const std::string& system_path);
 
   scoped_refptr<FileWatcherDelegate> delegate_;
   MountPointMap mounted_devices_;