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

chromeos/dbus/cros_disks_client.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 "chromeos/dbus/cros_disks_client.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 211 matching lines @@
                                   device_path,
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
   virtual void SetUpConnections(
       const MountEventHandler& mount_event_handler,
       const MountCompletedHandler& mount_completed_handler) OVERRIDE {
     static const SignalEventTuple kSignalEventTuples[] = {
-      { cros_disks::kDeviceAdded, DEVICE_ADDED },
-      { cros_disks::kDeviceScanned, DEVICE_SCANNED },
-      { cros_disks::kDeviceRemoved, DEVICE_REMOVED },
-      { cros_disks::kDiskAdded, DISK_ADDED },
-      { cros_disks::kDiskChanged, DISK_CHANGED },
-      { cros_disks::kDiskRemoved, DISK_REMOVED },
-      { cros_disks::kFormattingFinished, FORMATTING_FINISHED },
+      { cros_disks::kDeviceAdded, CROS_DISKS_DEVICE_ADDED },
+      { cros_disks::kDeviceScanned, CROS_DISKS_DEVICE_SCANNED },
+      { cros_disks::kDeviceRemoved, CROS_DISKS_DEVICE_REMOVED },
+      { cros_disks::kDiskAdded, CROS_DISKS_DISK_ADDED },
+      { cros_disks::kDiskChanged, CROS_DISKS_DISK_CHANGED },
+      { cros_disks::kDiskRemoved, CROS_DISKS_DISK_REMOVED },
+      { cros_disks::kFormattingFinished, CROS_DISKS_FORMATTING_FINISHED },
     };
     const size_t kNumSignalEventTuples = arraysize(kSignalEventTuples);
 
     for (size_t i = 0; i < kNumSignalEventTuples; ++i) {
       proxy_->ConnectToSignal(
           cros_disks::kCrosDisksInterface,
           kSignalEventTuples[i].signal_name,
           base::Bind(&CrosDisksClientImpl::OnMountEvent,
                      weak_ptr_factory_.GetWeakPtr(),
                      kSignalEventTuples[i].event_type,
@@ skipping 355 matching lines @@
 // static
 CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type,
                                          dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new CrosDisksClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new CrosDisksClientStubImpl();
 }
 
 }  // namespace chromeos