Formatting feature initial commit for ChromeOS Tree

chrome/browser/chromeos/extensions/file_browser_event_router.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/files/file_path_watcher.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/cros/mount_library.h"
 
 class Profile;
 
 namespace chromeos {
 class SystemNotification;
 }
 
 // Used to monitor disk mount changes and signal when new mounted usb device is
 // 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();
 
   // Starts/stops observing file system change events. Currently only
   // MountLibrary events are being observed.
   void ObserveFileSystemEvents(Profile* profile);
   void StopObservingFileSystemEvents();
 
   // File watch setup routines.
   bool AddFileWatch(const FilePath& file_path,
                     const FilePath& virtual_path,
                     const std::string& extension_id);
   void RemoveFileWatch(const FilePath& file_path,
                        const std::string& extension_id);
 
   // MountLibrary::Observer overrides.
   virtual void DiskChanged(chromeos::MountLibraryEventType event,
                            const chromeos::MountLibrary::Disk* disk);
   virtual void DeviceChanged(chromeos::MountLibraryEventType event,
                              const std::string& device_path);
 
  private:
   friend struct DefaultSingletonTraits<ExtensionFileBrowserEventRouter>;
   typedef std::map<std::string, linked_ptr<chromeos::SystemNotification> >
       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);
     }
     ~FileWatcherExtensions() {}
     linked_ptr<base::files::FilePathWatcher> file_watcher;
     FilePath local_path;
     FilePath virtual_path;
     std::set<std::string> extensions;
   } FileWatcherProcess;
   typedef std::map<FilePath, FileWatcherExtensions*> WatcherMap;
 
   // Helper class for passing through file watch notification events.
   class FileWatcherDelegate : public base::files::FilePathWatcher::Delegate {
    public:
     FileWatcherDelegate();
 
    private:
     // base::files::FilePathWatcher::Delegate overrides.
     virtual void OnFilePathChanged(const FilePath& path) OVERRIDE;
     virtual void OnFilePathError(const FilePath& path) OVERRIDE;
 
     void HandleFileWatchOnUIThread(const FilePath& local_path, bool got_error);
   };
 
   ExtensionFileBrowserEventRouter();
   virtual ~ExtensionFileBrowserEventRouter();
 
   // USB mount event handlers.
   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.
   NotificationMap::iterator FindNotificationForPath(const std::string& path);
 
   // Process file watch notifications.
   void HandleFileWatchNotification(const FilePath& path,
                                    bool got_error);
 
   // Sends folder change event.
   void DispatchFolderChangeEvent(const FilePath& path, bool error,
                                  const std::set<std::string>& extensions);
 
   // Sends filesystem changed extension message to all renderers.
   void DispatchMountEvent(const chromeos::MountLibrary::Disk* disk, bool added);
 
   void RemoveBrowserFromVector(const std::string& path);
 
   // Used to create a window of a standard size, and add it to a list
   // of tracked browser windows in case that device goes away.
   void OpenFileBrowse(const std::string& url,
                       const std::string& device_path,
                       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_;
   NotificationMap notifications_;
   WatcherMap file_watchers_;
   Profile* profile_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionFileBrowserEventRouter);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_