diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 20:59:10 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 20:59:10 +0000 |
commit | af26d450f99df8377176752ef916f02bdaa38133 (patch) | |
tree | 6064511c8a4c1db68be6247403709064ba3ee849 /chrome/browser | |
parent | 0be3bd3296556de5d921c76ded532912b44fd320 (diff) | |
download | chromium_src-af26d450f99df8377176752ef916f02bdaa38133.zip chromium_src-af26d450f99df8377176752ef916f02bdaa38133.tar.gz chromium_src-af26d450f99df8377176752ef916f02bdaa38133.tar.bz2 |
cros: Add missing "virtual" and OVERRIDE to overridden virtual methods of ScreenLockLibrary.
BUG=None
TEST=None
R=stevenjb@chromium.org
Review URL: http://codereview.chromium.org/7523031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/chromeos/cros/screen_lock_library.cc | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc index 7dab51f..f8aff15 100644 --- a/chrome/browser/chromeos/cros/screen_lock_library.cc +++ b/chrome/browser/chromeos/cros/screen_lock_library.cc @@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/cros/screen_lock_library.h" #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/observer_list.h" @@ -18,41 +19,43 @@ class ScreenLockLibraryImpl : public ScreenLockLibrary { public: ScreenLockLibraryImpl() {} - ~ScreenLockLibraryImpl() { + virtual ~ScreenLockLibraryImpl() { if (screen_lock_connection_) chromeos::DisconnectScreenLock(screen_lock_connection_); } - void Init() { + // Begin ScreenLockLibrary implementation. + virtual void Init() OVERRIDE { if (CrosLibrary::Get()->EnsureLoaded()) { screen_lock_connection_ = chromeos::MonitorScreenLock(&ScreenLockedHandler, this); } } - void AddObserver(Observer* observer) { + virtual void AddObserver(Observer* observer) OVERRIDE { observers_.AddObserver(observer); } - void RemoveObserver(Observer* observer) { + virtual void RemoveObserver(Observer* observer) OVERRIDE { observers_.RemoveObserver(observer); } - void NotifyScreenLockRequested() { + virtual void NotifyScreenLockRequested() OVERRIDE { chromeos::NotifyScreenLockRequested(); } - void NotifyScreenLockCompleted() { + virtual void NotifyScreenLockCompleted() OVERRIDE { chromeos::NotifyScreenLockCompleted(); } - void NotifyScreenUnlockRequested() { + virtual void NotifyScreenUnlockRequested() OVERRIDE { chromeos::NotifyScreenUnlockRequested(); } - void NotifyScreenUnlockCompleted() { + virtual void NotifyScreenUnlockCompleted() OVERRIDE { chromeos::NotifyScreenUnlockCompleted(); } + // End ScreenLockLibrary implementation. private: static void ScreenLockedHandler(void* object, ScreenLockEvent event) { @@ -117,14 +120,14 @@ class ScreenLockLibraryImpl : public ScreenLockLibrary { class ScreenLockLibraryStubImpl : public ScreenLockLibrary { public: ScreenLockLibraryStubImpl() {} - ~ScreenLockLibraryStubImpl() {} - void Init() {} - void AddObserver(Observer* observer) {} - void RemoveObserver(Observer* observer) {} - void NotifyScreenLockRequested() {} - void NotifyScreenLockCompleted() {} - void NotifyScreenUnlockRequested() {} - void NotifyScreenUnlockCompleted() {} + virtual ~ScreenLockLibraryStubImpl() {} + virtual void Init() OVERRIDE {} + virtual void AddObserver(Observer* observer) OVERRIDE {} + virtual void RemoveObserver(Observer* observer) OVERRIDE {} + virtual void NotifyScreenLockRequested() OVERRIDE {} + virtual void NotifyScreenLockCompleted() OVERRIDE {} + virtual void NotifyScreenUnlockRequested() OVERRIDE {} + virtual void NotifyScreenUnlockCompleted() OVERRIDE {} }; // static |