Replace mountType by volumeType on fileBrowserPrivate APIs.

chrome/browser/chromeos/extensions/file_manager/event_router.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/extensions/file_manager/event_router.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/app_id.h"
 #include "chrome/browser/chromeos/extensions/file_manager/desktop_notifications.h"
 #include "chrome/browser/chromeos/extensions/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.h"
 #include "chrome/browser/chromeos/extensions/file_manager/open_util.h"
+#include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 168 matching lines @@
 
   for (size_t i = 0; i < arraysize(kGooglePlusPhotosIds); ++i) {
     if (service->GetExtensionById(kGooglePlusPhotosIds[i],
                                   false /* include_disable */) != NULL)
       return true;
   }
 
   return false;
 }
 
+// This method is temporarily introduced to make a change step by step.
+// After mounting logic is moved to VolumeManager, this should be removed.
+std::string MountTypeToString(chromeos::MountType type) {
+  switch (type) {
+    case chromeos::MOUNT_TYPE_INVALID:
+      return "";
+    case chromeos::MOUNT_TYPE_DEVICE:
+      return util::VolumeTypeToString(VOLUME_TYPE_REMOVABLE_DISK_PARTITION);
+    case chromeos::MOUNT_TYPE_ARCHIVE:
+      return util::VolumeTypeToString(VOLUME_TYPE_MOUNTED_ARCHIVE_FILE);
+    case chromeos::MOUNT_TYPE_GOOGLE_DRIVE:
+      return util::VolumeTypeToString(VOLUME_TYPE_GOOGLE_DRIVE);
+  }
+  NOTREACHED();
+  return "";
+}
+
 }  // namespace
 
 // Pass dummy value to JobInfo's constructor for make it default constructible.
 EventRouter::DriveJobInfoWithStatus::DriveJobInfoWithStatus()
     : job_info(drive::TYPE_DOWNLOAD_FILE) {
 }
 
 EventRouter::DriveJobInfoWithStatus::DriveJobInfoWithStatus(
     const drive::JobInfo& info, const std::string& status)
     : job_info(info), status(status) {
@@ skipping 474 matching lines @@
     chromeos::MountError error_code,
     const DiskMountManager::MountPointInfo& mount_info) {
   scoped_ptr<ListValue> args(new ListValue());
   DictionaryValue* mount_info_value = new DictionaryValue();
   args->Append(mount_info_value);
   mount_info_value->SetString(
       "eventType",
       event == DiskMountManager::MOUNTING ? "mount" : "unmount");
   mount_info_value->SetString("status", MountErrorToString(error_code));
   mount_info_value->SetString(
-      "mountType",
-      DiskMountManager::MountTypeToString(mount_info.mount_type));
+      "volumeType", MountTypeToString(mount_info.mount_type));
 
   // Add sourcePath to the event.
   mount_info_value->SetString("sourcePath", mount_info.source_path);
 
   base::FilePath relative_mount_path;
 
   // If there were no error or some special conditions occurred, add mountPath
   // to the event.
   if (event == DiskMountManager::UNMOUNTING ||
       error_code == chromeos::MOUNT_ERROR_NONE ||
@@ skipping 146 matching lines @@
                                                chromeos::MOUNT_TYPE_DEVICE);
   } else {
     notifications_->HideNotification(DesktopNotifications::FORMAT_START,
                                      device_path);
     notifications_->ShowNotification(DesktopNotifications::FORMAT_FAIL,
                                      device_path);
   }
 }
 
 }  // namespace file_manager