Use cros-disks signal name constants defined in system_api/dbus/service_constants.h

chrome/browser/chromeos/dbus/cros_disks_client.cc

 // 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.
 
 #include "chrome/browser/chromeos/dbus/cros_disks_client.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
@@ skipping 156 matching lines @@
                                   device_path,
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
   virtual void SetUpConnections(
       MountEventHandler mount_event_handler,
       MountCompletedHandler mount_completed_handler) OVERRIDE {
     static const SignalEventTuple kSignalEventTuples[] = {
-      { "DeviceAdded", DEVICE_ADDED },
-      { "DeviceScanned", DEVICE_SCANNED },
-      { "DeviceRemoved", DEVICE_REMOVED },
-      { "DiskAdded", DISK_ADDED },
-      { "DiskChanged", DISK_CHANGED },
-      { "DiskRemoved", DISK_REMOVED },
-      { "FormattingFinished", FORMATTING_FINISHED },
+      { 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 },
     };
     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,
                      mount_event_handler),
           base::Bind(&CrosDisksClientImpl::OnSignalConnected,
                      weak_ptr_factory_.GetWeakPtr()));
     }
     proxy_->ConnectToSignal(
         cros_disks::kCrosDisksInterface,
-        "MountCompleted",
+        cros_disks::kMountCompleted,
         base::Bind(&CrosDisksClientImpl::OnMountCompleted,
                    weak_ptr_factory_.GetWeakPtr(),
                    mount_completed_handler ),
         base::Bind(&CrosDisksClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
  private:
   // A struct to contain a pair of signal name and mount event type.
   // Used by SetUpConnections.
@@ skipping 315 matching lines @@
 
 // static
 CrosDisksClient* CrosDisksClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS())
     return new CrosDisksClientImpl(bus);
   else
     return new CrosDisksClientStubImpl();
 }
 
 }  // namespace chromeos