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
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h
index ebe4ebaac49e47ac47b91defe3f1ab221c09afc2..17ce479ad8babc6c45b0753f93ef5ce02a78dc2b 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h
@@ -27,6 +27,11 @@ class SystemNotification;
 // found.
 class ExtensionFileBrowserEventRouter
     : public chromeos::MountLibrary::Observer {
+
+  friend void HideFileBrowserNotificationExternally(
+      const std::string& cathegory, const std::string& system_path,
+      ExtensionFileBrowserEventRouter* that);
+
  public:
   static ExtensionFileBrowserEventRouter* GetInstance();
 
@@ -54,7 +59,8 @@ class ExtensionFileBrowserEventRouter
       NotificationMap;
   typedef std::map<std::string, std::string> MountPointMap;
   typedef struct FileWatcherExtensions {
-    FileWatcherExtensions(const FilePath& path, const std::string& extension_id) {
+    FileWatcherExtensions(const FilePath& path,
+        const std::string& extension_id) {
       file_watcher.reset(new base::files::FilePathWatcher());
       virtual_path = path;
       extensions.insert(extension_id);
@@ -87,9 +93,13 @@ class ExtensionFileBrowserEventRouter
   void OnDiskAdded(const chromeos::MountLibrary::Disk* disk);

[achuithb, 2011/07/21 00:58:21]

These should all be virtual with OVERRIDE, I believe.

[sidor, 2011/07/21 18:24:15]

I didn't write this piece of code, I just added the functionality, I would
prefer not to change it because I am not sure about consequences.

[achuithb, 2011/07/21 22:02:32]

https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thr...

The suggestion is to modify all code to use OVERRIDE as appropriate as you come
across it. Your new functions should definitely have OVERRIDE, and the others
should too.

   void OnDiskRemoved(const chromeos::MountLibrary::Disk* disk);
   void OnDiskChanged(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.
@@ -115,10 +125,13 @@ class ExtensionFileBrowserEventRouter
                       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& cathegory,

[achuithb, 2011/07/21 00:58:21]

category

[sidor, 2011/07/21 18:24:15]

Done.

+                                   const std::string& system_path,
+                                   int icon_resource_id,
+                                   const string16& title,
+                                   const string16& message);
+  void HideFileBrowserNotification(const std::string& cathegory,
+                                   const std::string& system_path);
 
   scoped_refptr<FileWatcherDelegate> delegate_;
   MountPointMap mounted_devices_;