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

Unified Diff: chrome/browser/chromeos/file_manager/fake_disk_mount_manager.cc

Issue 2376733002: Add a missing include in fake_disk_mount_manager.cc. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/fake_disk_mount_manager.cc
diff --git a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.cc b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.cc
index 1572c4a839ddef54a4225a12944fa5b775850fc0..d9fe1e35fc4d9683992d060ca7c1cdd304726e1b 100644
--- a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.cc
+++ b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.cc
@@ -4,8 +4,6 @@
#include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h"
-#include "base/callback.h"
-
namespace file_manager {
FakeDiskMountManager::MountRequest::MountRequest(
@@ -55,9 +53,7 @@ const chromeos::disks::DiskMountManager::Disk*
FakeDiskMountManager::FindDiskBySourcePath(
const std::string& source_path) const {
DiskMap::const_iterator iter = disks_.find(source_path);
- if (iter == disks_.end())
- return nullptr;
- return iter->second.get();
+ return iter != disks_.end() ? iter->second.get() : nullptr;
}
const chromeos::disks::DiskMountManager::MountPointMap&
@@ -99,12 +95,14 @@ void FakeDiskMountManager::UnmountPath(const std::string& mount_path,
MountPointMap::iterator iter = mount_points_.find(mount_path);
if (iter == mount_points_.end())
return;
+
const MountPointInfo mount_point = iter->second;
mount_points_.erase(iter);
FOR_EACH_OBSERVER(DiskMountManager::Observer, observers_,
OnMountEvent(DiskMountManager::UNMOUNTING,
chromeos::MOUNT_ERROR_NONE,
mount_point));
+
// Enqueue callback so that |FakeDiskMountManager::FinishAllUnmountRequest()|
// can call them.
pending_unmount_callbacks_.push(callback);
@@ -113,6 +111,7 @@ void FakeDiskMountManager::UnmountPath(const std::string& mount_path,
bool FakeDiskMountManager::FinishAllUnmountPathRequests() {
if (pending_unmount_callbacks_.empty())
return false;
+
while (!pending_unmount_callbacks_.empty()) {
pending_unmount_callbacks_.front().Run(chromeos::MOUNT_ERROR_NONE);
pending_unmount_callbacks_.pop();
« no previous file with comments | « chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698