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

Side by Side Diff: chromeos/disks/disk_mount_manager.cc

Issue 1540803002: Switch to standard integer types in chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes Created 5 years 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 unified diff | Download patch
« no previous file with comments | « chromeos/disks/disk_mount_manager.h ('k') | chromeos/disks/disk_mount_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chromeos/disks/disk_mount_manager.h" 5 #include "chromeos/disks/disk_mount_manager.h"
6 6
7 #include <stddef.h>
8 #include <stdint.h>
9
7 #include <set> 10 #include <set>
8 11
9 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
11 #include "base/observer_list.h" 15 #include "base/observer_list.h"
12 #include "base/stl_util.h" 16 #include "base/stl_util.h"
13 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
14 #include "chromeos/dbus/dbus_thread_manager.h" 18 #include "chromeos/dbus/dbus_thread_manager.h"
15 #include "chromeos/disks/suspend_unmount_manager.h" 19 #include "chromeos/disks/suspend_unmount_manager.h"
16 20
17 namespace chromeos { 21 namespace chromeos {
18 namespace disks { 22 namespace disks {
19 23
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 const std::string& file_path, 648 const std::string& file_path,
645 const std::string& device_label, 649 const std::string& device_label,
646 const std::string& drive_label, 650 const std::string& drive_label,
647 const std::string& vendor_id, 651 const std::string& vendor_id,
648 const std::string& vendor_name, 652 const std::string& vendor_name,
649 const std::string& product_id, 653 const std::string& product_id,
650 const std::string& product_name, 654 const std::string& product_name,
651 const std::string& fs_uuid, 655 const std::string& fs_uuid,
652 const std::string& system_path_prefix, 656 const std::string& system_path_prefix,
653 DeviceType device_type, 657 DeviceType device_type,
654 uint64 total_size_in_bytes, 658 uint64_t total_size_in_bytes,
655 bool is_parent, 659 bool is_parent,
656 bool is_read_only, 660 bool is_read_only,
657 bool has_media, 661 bool has_media,
658 bool on_boot_device, 662 bool on_boot_device,
659 bool on_removable_device, 663 bool on_removable_device,
660 bool is_hidden) 664 bool is_hidden)
661 : device_path_(device_path), 665 : device_path_(device_path),
662 mount_path_(mount_path), 666 mount_path_(mount_path),
663 system_path_(system_path), 667 system_path_(system_path),
664 file_path_(file_path), 668 file_path_(file_path),
665 device_label_(device_label), 669 device_label_(device_label),
666 drive_label_(drive_label), 670 drive_label_(drive_label),
667 vendor_id_(vendor_id), 671 vendor_id_(vendor_id),
668 vendor_name_(vendor_name), 672 vendor_name_(vendor_name),
669 product_id_(product_id), 673 product_id_(product_id),
670 product_name_(product_name), 674 product_name_(product_name),
671 fs_uuid_(fs_uuid), 675 fs_uuid_(fs_uuid),
672 system_path_prefix_(system_path_prefix), 676 system_path_prefix_(system_path_prefix),
673 device_type_(device_type), 677 device_type_(device_type),
674 total_size_in_bytes_(total_size_in_bytes), 678 total_size_in_bytes_(total_size_in_bytes),
675 is_parent_(is_parent), 679 is_parent_(is_parent),
676 is_read_only_(is_read_only), 680 is_read_only_(is_read_only),
677 has_media_(has_media), 681 has_media_(has_media),
678 on_boot_device_(on_boot_device), 682 on_boot_device_(on_boot_device),
679 on_removable_device_(on_removable_device), 683 on_removable_device_(on_removable_device),
680 is_hidden_(is_hidden) { 684 is_hidden_(is_hidden) {}
681 }
682 685
683 DiskMountManager::Disk::~Disk() {} 686 DiskMountManager::Disk::~Disk() {}
684 687
685 bool DiskMountManager::AddDiskForTest(Disk* disk) { 688 bool DiskMountManager::AddDiskForTest(Disk* disk) {
686 return false; 689 return false;
687 } 690 }
688 691
689 bool DiskMountManager::AddMountPointForTest(const MountPointInfo& mount_point) { 692 bool DiskMountManager::AddMountPointForTest(const MountPointInfo& mount_point) {
690 return false; 693 return false;
691 } 694 }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 VLOG(1) << "DiskMountManager Shutdown completed"; 756 VLOG(1) << "DiskMountManager Shutdown completed";
754 } 757 }
755 758
756 // static 759 // static
757 DiskMountManager* DiskMountManager::GetInstance() { 760 DiskMountManager* DiskMountManager::GetInstance() {
758 return g_disk_mount_manager; 761 return g_disk_mount_manager;
759 } 762 }
760 763
761 } // namespace disks 764 } // namespace disks
762 } // namespace chromeos 765 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/disks/disk_mount_manager.h ('k') | chromeos/disks/disk_mount_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698