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

chrome/browser/system_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros implementation.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 102 matching lines @@
   for (disks::DiskMountManager::MountPointMap::const_iterator it =
            mount_point_map.begin(); it != mount_point_map.end(); ++it) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(
             &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
             this, it->second));
   }
 }
 
-void RemovableDeviceNotificationsCros::DiskChanged(
-    disks::DiskMountManagerEventType event,
+void RemovableDeviceNotificationsCros::OnDiskEvent(
+    disks::DiskMountManager::DiskEvent event,
     const disks::DiskMountManager::Disk* disk) {
 }
 
-void RemovableDeviceNotificationsCros::DeviceChanged(
-    disks::DiskMountManagerEventType event,
+void RemovableDeviceNotificationsCros::OnDeviceEvent(
+    disks::DiskMountManager::DeviceEvent event,
     const std::string& device_path) {
 }
 
-void RemovableDeviceNotificationsCros::MountCompleted(
-    disks::DiskMountManager::MountEvent event_type,
+void RemovableDeviceNotificationsCros::OnMountEvent(
+    disks::DiskMountManager::MountEvent event,
     MountError error_code,
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Ignore mount points that are not devices.
   if (mount_info.mount_type != MOUNT_TYPE_DEVICE)
     return;
   // Ignore errors.
   if (error_code != MOUNT_ERROR_NONE)
     return;
   if (mount_info.mount_condition != disks::MOUNT_CONDITION_NONE)
     return;
 
-  switch (event_type) {
+  switch (event) {
     case disks::DiskMountManager::MOUNTING: {
       if (ContainsKey(mount_map_, mount_info.mount_path)) {
         NOTREACHED();
         return;
       }
 
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(
               &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
               this, mount_info));
       break;
     }
     case disks::DiskMountManager::UNMOUNTING: {
       MountMap::iterator it = mount_map_.find(mount_info.mount_path);
       if (it == mount_map_.end())
         return;
       SystemMonitor::Get()->ProcessRemovableStorageDetached(
           it->second.device_id);
       mount_map_.erase(it);
       break;
     }
   }
 }
 
+void RemovableDeviceNotificationsCros::OnFormatEvent(
+    disks::DiskMountManager::FormatEvent event,
+    FormatError error_code,
+    const std::string& device_path) {

[Ben Chan, 2012/11/12 23:10:50]

missing a TODO / NOTIMPLEMENT?

[tbarzic, 2012/11/12 23:14:39]

not really. RemovableDeviceNotificationsCros is not interested in this event, so
it just ignores it.

+}
+
 bool RemovableDeviceNotificationsCros::GetDeviceInfoForPath(
     const FilePath& path,
     SystemMonitor::RemovableStorageInfo* device_info) const {
   if (!path.IsAbsolute())
     return false;
 
   FilePath current = path;
   while (!ContainsKey(mount_map_, current.value()) &&
          current != current.DirName()) {
     current = current.DirName();
@@ skipping 52 matching lines @@
   SystemMonitor::RemovableStorageInfo info(device_id, device_label,
                                            mount_info.mount_path);
   mount_map_.insert(std::make_pair(mount_info.mount_path, info));
   SystemMonitor::Get()->ProcessRemovableStorageAttached(
       device_id,
       device_label,
       mount_info.mount_path);
 }
 
 }  // namespace chrome