Extract OnDiskEvent and OnFormatEvent logic part from EventRouter to VolumeManager.

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"
@@ skipping 372 matching lines @@
   // Remove the watcher if |watch_path| is no longer watched by any extensions.
   iter->second->RemoveExtension(extension_id);
   if (iter->second->GetExtensionIds().empty()) {
     delete iter->second;
     file_watchers_.erase(iter);
   }
 }
 
 void EventRouter::OnDiskEvent(DiskMountManager::DiskEvent event,
                               const DiskMountManager::Disk* disk) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Disregard hidden devices.
-  if (disk->is_hidden())
-    return;
-  if (event == DiskMountManager::DISK_ADDED) {
-    OnDiskAdded(disk);
-  } else if (event == DiskMountManager::DISK_REMOVED) {
-    OnDiskRemoved(disk);
-  }
+  // Disk event is dispatched by VolumeManager now. Do nothing.
 }
 
 void EventRouter::OnDeviceEvent(DiskMountManager::DeviceEvent event,
                                 const std::string& device_path) {
   // Device event is dispatched by VolumeManager now. Do nothing.
 }
 
 void EventRouter::OnMountEvent(
     DiskMountManager::MountEvent event,
     chromeos::MountError error_code,
@@ skipping 41 matching lines @@
             base::FilePath(mount_info.source_path),
             base::Bind(&OnMarkAsUnmounted));
       }
     }
   }
 }
 
 void EventRouter::OnFormatEvent(DiskMountManager::FormatEvent event,
                                 chromeos::FormatError error_code,
                                 const std::string& device_path) {
-  if (event == DiskMountManager::FORMAT_STARTED) {
-    OnFormatStarted(device_path, error_code == chromeos::FORMAT_ERROR_NONE);
-  } else if (event == DiskMountManager::FORMAT_COMPLETED) {
-    OnFormatCompleted(device_path, error_code == chromeos::FORMAT_ERROR_NONE);
-  }
+  // Format event is dispatched by VolumeManager now. Do nothing.
 }
 
 void EventRouter::NetworkManagerChanged() {
   if (!profile_ ||
       !extensions::ExtensionSystem::Get(profile_)->event_router()) {
     NOTREACHED();
     return;
   }
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::event_names::kOnFileBrowserDriveConnectionStatusChanged,
@@ skipping 276 matching lines @@
   // If there is no DCIM folder or an external photo importer is not available,
   // then launch Files.app.
   DirectoryExistsOnUIThread(
       dcim_path,
       IsGooglePhotosInstalled(profile_) ?
       base::Bind(&base::DoNothing) :
       base::Bind(&util::OpenRemovableDrive, mount_path),
       base::Bind(&util::OpenRemovableDrive, mount_path));
 }
 
-void EventRouter::OnDiskAdded(const DiskMountManager::Disk* disk) {
+void EventRouter::OnDiskAdded(
+    const DiskMountManager::Disk& disk, bool mounting) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  VLOG(1) << "Disk added: " << disk->device_path();
-  if (disk->device_path().empty()) {
-    VLOG(1) << "Empty system path for " << disk->device_path();
-    return;
-  }
-
-  // If disk is not mounted yet and it has media and there is no policy
-  // forbidding external storage, give it a try.
-  if (disk->mount_path().empty() && disk->has_media() &&
-      !profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
-    // Initiate disk mount operation. MountPath auto-detects the filesystem
-    // format if the second argument is empty. The third argument (mount label)
-    // is not used in a disk mount operation.
-    DiskMountManager::GetInstance()->MountPath(
-        disk->device_path(), std::string(), std::string(),
-        chromeos::MOUNT_TYPE_DEVICE);
-  } else {
-    // Either the disk was mounted or it has no media. In both cases we don't
-    // want the Scanning notification to persist.
+  if (!mounting) {
+    // If the disk is not being mounted, we don't want the Scanning
+    // notification to persist.
     notifications_->HideNotification(DesktopNotifications::DEVICE,
-                                     disk->system_path_prefix());
+                                     disk.system_path_prefix());
   }
 }
 
-void EventRouter::OnDiskRemoved(const DiskMountManager::Disk* disk) {
+void EventRouter::OnDiskRemoved(const DiskMountManager::Disk& disk) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  VLOG(1) << "Disk removed: " << disk->device_path();
-
-  if (!disk->mount_path().empty()) {
-    DiskMountManager::GetInstance()->UnmountPath(
-        disk->mount_path(),
-        chromeos::UNMOUNT_OPTIONS_LAZY,
-        DiskMountManager::UnmountPathCallback());
-  }
+  // Do nothing.
 }
 
 void EventRouter::OnDeviceAdded(const std::string& device_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // If the policy is set instead of showing the new device notification,
   // we show a notification that the operation is not permitted.
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
     notifications_->ShowNotification(
         DesktopNotifications::DEVICE_EXTERNAL_STORAGE_DISABLED,
@@ skipping 37 matching lines @@
   if (success) {
     notifications_->HideNotification(DesktopNotifications::FORMAT_START,
                                      device_path);
     notifications_->ShowNotification(DesktopNotifications::FORMAT_SUCCESS,
                                      device_path);
     // Hide it after a couple of seconds.
     notifications_->HideNotificationDelayed(
         DesktopNotifications::FORMAT_SUCCESS,
         device_path,
         base::TimeDelta::FromSeconds(4));
-    // MountPath auto-detects filesystem format if second argument is empty.
-    // The third argument (mount label) is not used in a disk mount operation.
-    DiskMountManager::GetInstance()->MountPath(device_path, std::string(),
-                                               std::string(),
-                                               chromeos::MOUNT_TYPE_DEVICE);
   } else {
     notifications_->HideNotification(DesktopNotifications::FORMAT_START,
                                      device_path);
     notifications_->ShowNotification(DesktopNotifications::FORMAT_FAIL,
                                      device_path);
   }
 }
 
 }  // namespace file_manager