Files.app: Start to use DeviceEventRouter.

chrome/browser/chromeos/extensions/file_manager/device_event_router.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/extensions/file_manager/device_event_router.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 59 matching lines @@
       base::Bind(&DeviceEventRouter::OnDeviceAddedDelayed,
                  weak_factory_.GetWeakPtr(),
                  device_path),
       scan_time_delta_);
 }
 
 void DeviceEventRouter::OnDeviceAddedDelayed(const std::string& device_path) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (GetDeviceState(device_path) == DEVICE_SCANNED) {
-    // TODO(hirono): Rename DEVICE_EVENT_TYPE_ADDED with
-    // DEVICE_EVENT_TYPE_SCAN_STARTED.
-    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_ADDED, device_path);
+    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
+                  device_path);
     SetDeviceState(device_path, DEVICE_SCANNED_AND_REPORTED);
   }
 }
 
 void DeviceEventRouter::OnDeviceRemoved(const std::string& device_path) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SetDeviceState(device_path, DEVICE_STATE_USUAL);
   OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_REMOVED, device_path);
 }
 
 void DeviceEventRouter::OnDiskAdded(
     const chromeos::disks::DiskMountManager::Disk& disk,
     bool mounting) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!mounting) {
     // If the disk is not being mounted, mark the device scan cancelled.
     const std::string& device_path = disk.system_path_prefix();
     if (GetDeviceState(device_path) == DEVICE_SCANNED_AND_REPORTED) {
-      OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_CANCELED,
+      OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
                     device_path);
     }
     SetDeviceState(device_path, DEVICE_STATE_USUAL);
   }
 }
 
 void DeviceEventRouter::OnDiskRemoved(
     const chromeos::disks::DiskMountManager::Disk& disk) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 39 matching lines @@
 
 void DeviceEventRouter::OnFormatCompleted(const std::string& device_path,
                                           bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   OnDeviceEvent(success ? file_browser_private::DEVICE_EVENT_TYPE_FORMAT_SUCCESS
                         : file_browser_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
                 device_path);
 }
 
-void DeviceEventRouter::OnHardUnplugged(const std::string& device_path) {
-}
-
 void DeviceEventRouter::SuspendImminent() {
   DCHECK(thread_checker_.CalledOnValidThread());
   is_resuming_ = true;
 }
 
 void DeviceEventRouter::SuspendDone(const base::TimeDelta& sleep_duration) {
   DCHECK(thread_checker_.CalledOnValidThread());
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DeviceEventRouter::SuspendDoneDelayed,
@@ skipping 19 matching lines @@
     device_states_[device_path] = state;
   } else {
     const std::map<std::string, DeviceState>::iterator it =
         device_states_.find(device_path);
     if (it != device_states_.end())
       device_states_.erase(it);
   }
 }
 
 }  // namespace file_manager