Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: chrome/browser/chromeos/extensions/file_manager/device_event_router.cc

Issue 541623002: Files.app: Remove scanning notification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
index 3202ba3c6948aff47de3812dcd79bdb2aebaa7c1..b6252e351c5844819ec597192efac2cd92e4bea7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
@@ -17,7 +17,6 @@ using content::BrowserThread;
DeviceEventRouter::DeviceEventRouter()
: resume_time_delta_(base::TimeDelta::FromSeconds(5)),
startup_time_delta_(base::TimeDelta::FromSeconds(10)),
- scan_time_delta_(base::TimeDelta::FromSeconds(5)),
is_starting_up_(false),
is_resuming_(false),
weak_factory_(this) {
@@ -26,7 +25,6 @@ DeviceEventRouter::DeviceEventRouter()
DeviceEventRouter::DeviceEventRouter(base::TimeDelta overriding_time_delta)
: resume_time_delta_(overriding_time_delta),
startup_time_delta_(overriding_time_delta),
- scan_time_delta_(overriding_time_delta),
is_starting_up_(false),
is_resuming_(false),
weak_factory_(this) {
@@ -52,35 +50,12 @@ void DeviceEventRouter::StartupDelayed() {
void DeviceEventRouter::OnDeviceAdded(const std::string& device_path) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (is_starting_up_ || is_resuming_) {
- SetDeviceState(device_path, DEVICE_STATE_USUAL);
- return;
- }
-
+ SetDeviceState(device_path, DEVICE_STATE_USUAL);
if (IsExternalStorageDisabled()) {
OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_DISABLED,
device_path);
- SetDeviceState(device_path, DEVICE_STATE_USUAL);
return;
}
-
- SetDeviceState(device_path, DEVICE_SCANNED);
- base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
- FROM_HERE,
- 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) {
- OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
- device_path);
- SetDeviceState(device_path, DEVICE_SCANNED_AND_REPORTED);
- }
}
void DeviceEventRouter::OnDeviceRemoved(const std::string& device_path) {
@@ -92,17 +67,7 @@ void DeviceEventRouter::OnDeviceRemoved(const std::string& 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_manager_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
- device_path);
- }
- SetDeviceState(device_path, DEVICE_STATE_USUAL);
- }
+ // Do nothing.
}
void DeviceEventRouter::OnDiskRemoved(

Powered by Google App Engine
This is Rietveld 408576698