ChromeOS: Implement MediaTransferProtocolManager observer.

chrome/browser/system_monitor/chromeos/media_transfer_protocol_device_observer.cc

Index: chrome/browser/system_monitor/chromeos/media_transfer_protocol_device_observer.cc
diff --git a/chrome/browser/system_monitor/chromeos/media_transfer_protocol_device_observer.cc b/chrome/browser/system_monitor/chromeos/media_transfer_protocol_device_observer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1fba2c472ddb62570e05328c979a4726ce865b66
--- /dev/null
+++ b/chrome/browser/system_monitor/chromeos/media_transfer_protocol_device_observer.cc
@@ -0,0 +1,159 @@
+// 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/system_monitor/chromeos/media_transfer_protocol_device_observer.h"
+
+#include "base/metrics/histogram.h"
+#include "base/stl_util.h"
+#include "base/string_number_conversions.h"
+#include "base/string_split.h"
+#include "base/system_monitor/system_monitor.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/chromeos/mtp/media_transfer_protocol_manager.h"
+#include "chrome/browser/system_monitor/removable_device_constants.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
+#include "chromeos/dbus/mtp_storage_info.pb.h"
+
+namespace chromeos {
+namespace mtp {
+
+using chrome::MediaStorageUtil;
+
+namespace {
+
+// Device root path constant.
+const char kRootPath[] = "/";
+
+// Helper function to get an instance of MediaTransferProtocolManager.
+MediaTransferProtocolManager* GetMediaTransferProtocolManager() {
+  MediaTransferProtocolManager* mtp_dev_mgr =
+      MediaTransferProtocolManager::GetInstance();
+  return mtp_dev_mgr;
+}
+
+// Helper function to get device id from storage information.
+std::string GetDeviceIdFromStorageInfo(const MtpStorageInfo& storage_info,

[Lei Zhang, 2012/09/10 18:18:01]

|storage_info| is not used anymore. Function name is also out of date.

[kmadhusu, 2012/09/11 01:50:19]

oops. Fixed. Thanks for catching this.

+                                       const std::string& storage_name) {
+  std::string unique_id(chrome::kFSUniqueIdPrefix + storage_name);
+  return MediaStorageUtil::MakeDeviceId(MediaStorageUtil::MTP_OR_PTP,
+                                        unique_id);
+}
+
+// Helper function to get device label from storage information.
+string16 GetDeviceLabelFromStorageInfo(const MtpStorageInfo& storage_info) {
+  std::string device_label;
+  const std::string& vendor_name = storage_info.vendor();
+  device_label = vendor_name;
+
+  const std::string& product_name = storage_info.product();
+  if (!product_name.empty()) {
+    if (!device_label.empty())
+      device_label += chrome::kSpaceDelim;
+    device_label += product_name;
+  }
+  return UTF8ToUTF16(device_label);
+}
+
+// Helper function to get the device storage details such as device id, label
+// and location. On success and fills in |id|, |label| and |location|.
+void GetStorageInfo(const std::string& storage_name,
+                    std::string* id,
+                    string16* label,
+                    std::string* location) {
+  DCHECK(!storage_name.empty());
+  MediaTransferProtocolManager* mtp_dev_mgr = GetMediaTransferProtocolManager();
+  DCHECK(mtp_dev_mgr);
+  const MtpStorageInfo* storage_info =
+      mtp_dev_mgr->GetStorageInfo(storage_name);
+
+  if (!storage_info)
+    return;
+
+  if (id)
+    *id = GetDeviceIdFromStorageInfo(*storage_info, storage_name);
+
+  if (label)
+    *label = GetDeviceLabelFromStorageInfo(*storage_info);
+
+  // Construct a dummy device path using the storage name. This is only used
+  // for registering device media file system.
+  // E.g.: /usb:2,2:12345
+  if (location)
+    *location = kRootPath + storage_name;
+}
+
+}  // namespace
+
+MediaTransferProtocolDeviceObserver::MediaTransferProtocolDeviceObserver()
+    : get_storage_info_func_(&GetStorageInfo) {
+  MediaTransferProtocolManager* mtp_dev_mgr = GetMediaTransferProtocolManager();
+  if (mtp_dev_mgr)
+    mtp_dev_mgr->AddObserver(this);
+  EnumerateStorages();
+}
+
+MediaTransferProtocolDeviceObserver::MediaTransferProtocolDeviceObserver(
+    GetStorageInfoFunc get_storage_info_func)
+    : get_storage_info_func_(get_storage_info_func) {

[Lei Zhang, 2012/09/10 18:18:01]

It's weird how this doesn't call AddObserver(), whereas the other other ctor and
dtor does.

[kmadhusu, 2012/09/11 01:50:19]

Added DCHECK and a comment in the function body.

+}
+
+MediaTransferProtocolDeviceObserver::~MediaTransferProtocolDeviceObserver() {
+  MediaTransferProtocolManager* mtp_dev_mgr = GetMediaTransferProtocolManager();
+  if (mtp_dev_mgr)
+    mtp_dev_mgr->RemoveObserver(this);
+}
+
+// MediaTransferProtocolManager::Observer override.
+void MediaTransferProtocolDeviceObserver::StorageChanged(
+    bool is_attached,
+    const std::string& storage_name) {
+  DCHECK(!storage_name.empty());
+
+  base::SystemMonitor* system_monitor = base::SystemMonitor::Get();
+  DCHECK(system_monitor);
+
+  // New storage is attached.
+  if (is_attached) {
+    std::string device_id;
+    string16 device_name;
+    std::string location;
+    get_storage_info_func_(storage_name, &device_id, &device_name, &location);
+
+    // Keep track of device id and device name to see how often we receive
+    // empty values.
+    UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.mtp_device_uuid_available",
+                          !device_id.empty());
+    UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.mtp_device_name_available",
+                          !device_name.empty());
+
+    if (device_id.empty() || device_name.empty())
+      return;
+
+    DCHECK(!ContainsKey(storage_map_, storage_name));
+    storage_map_[storage_name] = device_id;
+    system_monitor->ProcessRemovableStorageAttached(device_id, device_name,
+                                                    location);
+  } else {
+    // Existing storage is detached.
+    StorageNameAndIdMap::iterator it = storage_map_.find(storage_name);
+    if (it == storage_map_.end())
+      return;
+    system_monitor->ProcessRemovableStorageDetached(it->second);
+    storage_map_.erase(it);
+  }
+}
+
+void MediaTransferProtocolDeviceObserver::EnumerateStorages() {
+  typedef std::vector<std::string> StorageList;
+  MediaTransferProtocolManager* mtp_dev_mgr = GetMediaTransferProtocolManager();
+  DCHECK(mtp_dev_mgr);
+  StorageList storages = mtp_dev_mgr->GetStorages();
+  for (StorageList::const_iterator storage_iter = storages.begin();
+       storage_iter != storages.end(); ++storage_iter) {
+    StorageChanged(true, *storage_iter);
+  }
+}
+
+}  // namespace mtp
+}  // namespace chromeos