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

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

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | chromeos/disks/mock_disk_mount_manager.h » ('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 <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 it != system_path_prefixes_.end(); 603 it != system_path_prefixes_.end();
604 ++it) { 604 ++it) {
605 const std::string& prefix = *it; 605 const std::string& prefix = *it;
606 if (StartsWithASCII(system_path, prefix, true)) 606 if (StartsWithASCII(system_path, prefix, true))
607 return prefix; 607 return prefix;
608 } 608 }
609 return base::EmptyString(); 609 return base::EmptyString();
610 } 610 }
611 611
612 // Mount event change observers. 612 // Mount event change observers.
613 ObserverList<Observer> observers_; 613 base::ObserverList<Observer> observers_;
614 614
615 CrosDisksClient* cros_disks_client_; 615 CrosDisksClient* cros_disks_client_;
616 616
617 // The list of disks found. 617 // The list of disks found.
618 DiskMountManager::DiskMap disks_; 618 DiskMountManager::DiskMap disks_;
619 619
620 DiskMountManager::MountPointMap mount_points_; 620 DiskMountManager::MountPointMap mount_points_;
621 621
622 typedef std::set<std::string> SystemPathPrefixSet; 622 typedef std::set<std::string> SystemPathPrefixSet;
623 SystemPathPrefixSet system_path_prefixes_; 623 SystemPathPrefixSet system_path_prefixes_;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 VLOG(1) << "DiskMountManager Shutdown completed"; 747 VLOG(1) << "DiskMountManager Shutdown completed";
748 } 748 }
749 749
750 // static 750 // static
751 DiskMountManager* DiskMountManager::GetInstance() { 751 DiskMountManager* DiskMountManager::GetInstance() {
752 return g_disk_mount_manager; 752 return g_disk_mount_manager;
753 } 753 }
754 754
755 } // namespace disks 755 } // namespace disks
756 } // namespace chromeos 756 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | chromeos/disks/mock_disk_mount_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698