Some filebrowser bugs and retiring DiskChanged event in filebrowser

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>
@@ skipping 28 matching lines @@
                     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) OVERRIDE;
   virtual void DeviceChanged(chromeos::MountLibraryEventType event,
                              const std::string& device_path) OVERRIDE;
-
   virtual void MountCompleted(chromeos::MountLibrary::MountEvent event_type,
       chromeos::MountError error_code,
       const chromeos::MountLibrary::MountPointInfo& mount_info) OVERRIDE;
 
  private:
   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;
@@ skipping 10 matching lines @@
     virtual void OnFilePathError(const FilePath& path) OVERRIDE;
 
     void HandleFileWatchOnUIThread(const FilePath& local_path, bool got_error);
 
     ExtensionFileBrowserEventRouter* router_;
   };
 
   // USB mount event handlers.
   void OnDiskAdded(const chromeos::MountLibrary::Disk* disk);
   void OnDiskRemoved(const chromeos::MountLibrary::Disk* disk);
-  void OnDiskChanged(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);
 
   // 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 DispatchDiskEvent(const chromeos::MountLibrary::Disk* disk, bool added);
 
   void DispatchMountCompletedEvent(chromeos::MountLibrary::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::MountLibrary::MountPointInfo& mount_info);
 
   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,
@@ skipping 10 matching lines @@
   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_