From 6c40271dd53f12da29048406ab66668d4d578fce Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 6 Jan 2015 23:51:13 -0500
Subject: [PATCH] Bug 1118609 - Mark virtual overridden functions as
 MOZ_OVERRIDE in dom/storage; r=baku

---
 dom/storage/DOMStorageCache.cpp |  2 +-
 dom/storage/DOMStorageIPC.h     | 22 +++++++++++-----------
 dom/storage/DOMStorageManager.h |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dom/storage/DOMStorageCache.cpp b/dom/storage/DOMStorageCache.cpp
index 1570a46de2b09..f00bc6df8e9fb 100644
--- a/dom/storage/DOMStorageCache.cpp
+++ b/dom/storage/DOMStorageCache.cpp
@@ -247,7 +247,7 @@ class DOMStorageCacheHolder : public nsITimerCallback
   NS_DECL_ISUPPORTS
 
   NS_IMETHODIMP
-  Notify(nsITimer* aTimer)
+  Notify(nsITimer* aTimer) MOZ_OVERRIDE
   {
     mCache = nullptr;
     return NS_OK;
diff --git a/dom/storage/DOMStorageIPC.h b/dom/storage/DOMStorageIPC.h
index ea2ba680229f4..a0bcdfdd0356e 100644
--- a/dom/storage/DOMStorageIPC.h
+++ b/dom/storage/DOMStorageIPC.h
@@ -174,27 +174,27 @@ class DOMStorageDBParent MOZ_FINAL : public PStorageParent
 private:
   // IPC
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
-  bool RecvAsyncPreload(const nsCString& aScope, const bool& aPriority);
+  bool RecvAsyncPreload(const nsCString& aScope, const bool& aPriority) MOZ_OVERRIDE;
   bool RecvPreload(const nsCString& aScope, const uint32_t& aAlreadyLoadedCount,
                    InfallibleTArray<nsString>* aKeys, InfallibleTArray<nsString>* aValues,
-                   nsresult* aRv);
-  bool RecvAsyncGetUsage(const nsCString& aScope);
-  bool RecvAsyncAddItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue);
-  bool RecvAsyncUpdateItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue);
-  bool RecvAsyncRemoveItem(const nsCString& aScope, const nsString& aKey);
-  bool RecvAsyncClear(const nsCString& aScope);
-  bool RecvAsyncFlush();
+                   nsresult* aRv) MOZ_OVERRIDE;
+  bool RecvAsyncGetUsage(const nsCString& aScope) MOZ_OVERRIDE;
+  bool RecvAsyncAddItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue) MOZ_OVERRIDE;
+  bool RecvAsyncUpdateItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue) MOZ_OVERRIDE;
+  bool RecvAsyncRemoveItem(const nsCString& aScope, const nsString& aKey) MOZ_OVERRIDE;
+  bool RecvAsyncClear(const nsCString& aScope) MOZ_OVERRIDE;
+  bool RecvAsyncFlush() MOZ_OVERRIDE;
 
   // DOMStorageObserverSink
-  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix);
+  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix) MOZ_OVERRIDE;
 
 private:
   CacheParentBridge* NewCache(const nsACString& aScope);
 
   ThreadSafeAutoRefCnt mRefCnt;
   NS_DECL_OWNINGTHREAD
-	
-	// True when IPC channel is open and Send*() methods are OK to use.
+
+  // True when IPC channel is open and Send*() methods are OK to use.
   bool mIPCOpen;
 };
 
diff --git a/dom/storage/DOMStorageManager.h b/dom/storage/DOMStorageManager.h
index 8a3ade5d62bad..b66d31b3748ba 100644
--- a/dom/storage/DOMStorageManager.h
+++ b/dom/storage/DOMStorageManager.h
@@ -46,7 +46,7 @@ class DOMStorageManager : public nsIDOMStorageManager
 
 private:
   // DOMStorageObserverSink, handler to various chrome clearing notification
-  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix);
+  virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix) MOZ_OVERRIDE;
 
   // Since nsTHashtable doesn't like multiple inheritance, we have to aggregate
   // DOMStorageCache into the entry.