From acb7fbfb6a67724edbfc813565b7e3bbfaa17cb1 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 13 Nov 2009 17:35:35 +0000 Subject: Rename loaded() to EnsureLoaded() to match my previous change. BUG=none TEST=none Review URL: http://codereview.chromium.org/391053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31913 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/mount_library.cc | 8 ++++---- chrome/browser/chromeos/mount_library.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser') diff --git a/chrome/browser/chromeos/mount_library.cc b/chrome/browser/chromeos/mount_library.cc index 1c99b97..8222b01 100644 --- a/chrome/browser/chromeos/mount_library.cc +++ b/chrome/browser/chromeos/mount_library.cc @@ -25,8 +25,8 @@ MountLibrary* MountLibrary::Get() { } // static -bool MountLibrary::loaded() { - return CrosLibrary::loaded(); +bool MountLibrary::EnsureLoaded() { + return CrosLibrary::EnsureLoaded(); } void MountLibrary::AddObserver(Observer* observer) { @@ -53,7 +53,7 @@ void MountLibrary::ParseDisks(const MountStatus& status) { } MountLibrary::MountLibrary() { - if (CrosLibrary::loaded()) { + if (CrosLibrary::EnsureLoaded()) { Init(); } else { LOG(ERROR) << "Cros Library has not been loaded"; @@ -61,7 +61,7 @@ MountLibrary::MountLibrary() { } MountLibrary::~MountLibrary() { - if (CrosLibrary::loaded()) { + if (CrosLibrary::EnsureLoaded()) { DisconnectMountStatus(mount_status_connection_); } } diff --git a/chrome/browser/chromeos/mount_library.h b/chrome/browser/chromeos/mount_library.h index 91b6059..642349b 100644 --- a/chrome/browser/chromeos/mount_library.h +++ b/chrome/browser/chromeos/mount_library.h @@ -42,7 +42,7 @@ class MountLibrary { static MountLibrary* Get(); // Returns true if the ChromeOS library was loaded. - static bool loaded(); + static bool EnsureLoaded(); void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); -- cgit v1.1