OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/cros/mount_library.h" | 5 #include "chrome/browser/chromeos/cros/mount_library.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <sys/statvfs.h> | 8 #include <sys/statvfs.h> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 } | 631 } |
632 } | 632 } |
633 | 633 |
634 void OnRequestMountInfo(const char** devices, | 634 void OnRequestMountInfo(const char** devices, |
635 size_t devices_len, | 635 size_t devices_len, |
636 MountMethodErrorType error, | 636 MountMethodErrorType error, |
637 const char* error_message) { | 637 const char* error_message) { |
638 std::set<std::string> current_device_set; | 638 std::set<std::string> current_device_set; |
639 if (error == MOUNT_METHOD_ERROR_NONE && devices && devices_len) { | 639 if (error == MOUNT_METHOD_ERROR_NONE && devices && devices_len) { |
640 // Initiate properties fetch for all removable disks, | 640 // Initiate properties fetch for all removable disks, |
641 bool found_disk = false; | |
642 for (size_t i = 0; i < devices_len; i++) { | 641 for (size_t i = 0; i < devices_len; i++) { |
643 if (!devices[i]) { | 642 if (!devices[i]) { |
644 NOTREACHED(); | 643 NOTREACHED(); |
645 continue; | 644 continue; |
646 } | 645 } |
647 current_device_set.insert(std::string(devices[i])); | 646 current_device_set.insert(std::string(devices[i])); |
648 found_disk = true; | |
649 // Initiate disk property retrieval for each relevant device path. | 647 // Initiate disk property retrieval for each relevant device path. |
650 libcros_proxy_->CallGetDiskProperties(devices[i], | 648 libcros_proxy_->CallGetDiskProperties(devices[i], |
651 &GetDiskPropertiesCallback, this); | 649 &GetDiskPropertiesCallback, this); |
652 } | 650 } |
653 } else if (error != MOUNT_METHOD_ERROR_NONE) { | 651 } else if (error != MOUNT_METHOD_ERROR_NONE) { |
654 LOG(WARNING) << "Request mount info retrieval request failed with error: " | 652 LOG(WARNING) << "Request mount info retrieval request failed with error: " |
655 << (error_message ? error_message : "Unknown"); | 653 << (error_message ? error_message : "Unknown"); |
656 } | 654 } |
657 // Search and remove disks that are no longer present. | 655 // Search and remove disks that are no longer present. |
658 for (MountLibrary::DiskMap::iterator iter = disks_.begin(); | 656 for (MountLibrary::DiskMap::iterator iter = disks_.begin(); |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
840 MountLibrary* impl; | 838 MountLibrary* impl; |
841 if (stub) | 839 if (stub) |
842 impl = new MountLibraryStubImpl(); | 840 impl = new MountLibraryStubImpl(); |
843 else | 841 else |
844 impl = new MountLibraryImpl(); | 842 impl = new MountLibraryImpl(); |
845 impl->Init(); | 843 impl->Init(); |
846 return impl; | 844 return impl; |
847 } | 845 } |
848 | 846 |
849 } // namespace chromeos | 847 } // namespace chromeos |
OLD | NEW |