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

chrome/browser/chromeos/imageburner/burn_controller.cc

 // 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.
 
 #include "chrome/browser/chromeos/imageburner/burn_controller.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/cros/burn_library.h"
@@ skipping 46 matching lines @@
   virtual ~BurnControllerImpl() {
     CrosLibrary::Get()->GetBurnLibrary()->RemoveObserver(this);
     if (state_machine_)
       state_machine_->RemoveObserver(this);
     burn_manager_->RemoveObserver(this);
     CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
     disks::DiskMountManager::GetInstance()->RemoveObserver(this);
   }
 
   // disks::DiskMountManager::Observer interface.
-  virtual void DiskChanged(disks::DiskMountManagerEventType event,
-                           const disks::DiskMountManager::Disk* disk)
-      OVERRIDE {
+  virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event,
+                           const disks::DiskMountManager::Disk* disk) OVERRIDE {
     if (!IsBurnableDevice(*disk))
       return;
-    if (event == disks::MOUNT_DISK_ADDED) {
+    if (event == disks::DiskMountManager::DISK_ADDED) {
       delegate_->OnDeviceAdded(*disk);
-    } else if (event == disks::MOUNT_DISK_REMOVED) {
+    } else if (event == disks::DiskMountManager::DISK_REMOVED) {
       delegate_->OnDeviceRemoved(*disk);
       if (burn_manager_->target_device_path().value() == disk->device_path())
         ProcessError(IDS_IMAGEBURN_DEVICE_NOT_FOUND_ERROR);
     }
   }
 
-  virtual void DeviceChanged(disks::DiskMountManagerEventType event,
+  virtual void OnDeviceEvent(disks::DiskMountManager::DeviceEvent event,
                              const std::string& device_path) OVERRIDE {
   }
 
-  virtual void MountCompleted(
-      disks::DiskMountManager::MountEvent event_type,
+  virtual void OnMountEvent(
+      disks::DiskMountManager::MountEvent event,
       MountError error_code,
-      const disks::DiskMountManager::MountPointInfo& mount_info)
-      OVERRIDE {
+      const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE {
+  }
+
+  virtual void OnFormatEvent(
+      disks::DiskMountManager::FormatEvent event,
+      FormatError error_code,
+      const std::string& device_path) OVERRIDE {
   }
 
   // BurnLibrary::Observer interface.
   virtual void BurnProgressUpdated(BurnLibrary* object,
                                    BurnEvent evt,
                                    const ImageBurnStatus& status) OVERRIDE {
     switch (evt) {
       case(BURN_SUCCESS):
         FinalizeBurn();
         break;
@@ skipping 258 matching lines @@
 
 // static
 BurnController* BurnController::CreateBurnController(
     content::WebContents* web_contents,
     Delegate* delegate) {
   return new BurnControllerImpl(delegate);
 }
 
 }  // namespace imageburner
 }  // namespace chromeos