Small refactoring in DiskMountManager (event reporting; format method).

chrome/browser/chromeos/extensions/file_browser_event_router.h

 // Copyright (c) 2012 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_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 44 matching lines @@
                     const FilePath& virtual_path,
                     const std::string& extension_id);
   void RemoveFileWatch(const FilePath& file_path,
                        const std::string& extension_id);
 
   // Mounts Drive on File browser. |callback| will be called after raising a
   // mount request event to file manager on JS-side.
   void MountDrive(const base::Closure& callback);
 
   // CrosDisksClient::Observer overrides.
-  virtual void DiskChanged(chromeos::disks::DiskMountManagerEventType event,
-                           const chromeos::disks::DiskMountManager::Disk* disk)
-      OVERRIDE;
-  virtual void DeviceChanged(chromeos::disks::DiskMountManagerEventType event,
-                             const std::string& device_path) OVERRIDE;
-  virtual void MountCompleted(
-      chromeos::disks::DiskMountManager::MountEvent event_type,
+  virtual void OnDiskEvent(
+      chromeos::disks::DiskMountManager::DiskEvent event,
+      const chromeos::disks::DiskMountManager::Disk* disk) OVERRIDE;
+  virtual void OnDeviceEvent(
+      chromeos::disks::DiskMountManager::DeviceEvent event,
+      const std::string& device_path) OVERRIDE;
+  virtual void OnMountEvent(
+      chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
       OVERRIDE;
+  virtual void OnFormatEvent(
+      chromeos::disks::DiskMountManager::FormatEvent event,
+      chromeos::FormatError error_code,
+      const std::string& device_path) OVERRIDE;
 
   // chromeos::NetworkLibrary::NetworkManagerObserver override.
   virtual void OnNetworkManagerChanged(
       chromeos::NetworkLibrary* network_library) OVERRIDE;
 
   // Overridden from PrefObserver.
   virtual void OnPreferenceChanged(PrefServiceBase* service,
                                    const std::string& pref_name) OVERRIDE;
 
   // drive::DriveServiceObserver overrides.
@@ skipping 66 matching lines @@
   virtual ~FileBrowserEventRouter();
 
   // USB mount event handlers.
   void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk* disk);
   void OnDiskRemoved(const chromeos::disks::DiskMountManager::Disk* disk);
   void OnDiskMounted(const chromeos::disks::DiskMountManager::Disk* disk);
   void OnDiskUnmounted(const chromeos::disks::DiskMountManager::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, bool success);
-  void OnFormattingFinished(const std::string& device_path, bool success);
+  void OnFormatStarted(const std::string& device_path, bool success);
+  void OnFormatCompleted(const std::string& device_path, bool success);
 
   // Process file watch notifications.
   void HandleFileWatchNotification(const FilePath& path,
                                    bool got_error);
 
   // Sends directory change event.
   void DispatchDirectoryChangeEvent(const FilePath& path, bool error,
                                     const ExtensionUsageRegistry& extensions);
 
   // Sends filesystem changed extension message to all renderers.
   void DispatchDiskEvent(const chromeos::disks::DiskMountManager::Disk* disk,
                          bool added);
 
-  void DispatchMountCompletedEvent(
+  void DispatchMountEvent(
       chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::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,
                       const std::string& device_path,
@@ skipping 46 matching lines @@
 
   FileBrowserEventRouterFactory();
   virtual ~FileBrowserEventRouterFactory();
 
   // ProfileKeyedServiceFactory:
   virtual scoped_refptr<RefcountedProfileKeyedService> BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_