Bug 1038195 - Give some classes in the Windows taskbar code private destructors; r=bjacob
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 15 Jul 2014 14:57:14 -0400
changeset 216149 d5cbd531e89e7335a7d2c1a317aadc1bb8f6d592
parent 216148 9beef470de57e8b24cb8869147c1fedf274c280b
child 216150 57f5916f07fb29f3b7f8f25eb139f34db376127c
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs1038195
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1038195 - Give some classes in the Windows taskbar code private destructors; r=bjacob
widget/windows/TaskbarPreview.h
widget/windows/TaskbarPreviewButton.h
widget/windows/TaskbarTabPreview.h
widget/windows/TaskbarWindowPreview.h
widget/windows/WinTaskbar.cpp
widget/windows/WinTaskbar.h
--- a/widget/windows/TaskbarPreview.h
+++ b/widget/windows/TaskbarPreview.h
@@ -21,21 +21,22 @@
 
 namespace mozilla {
 namespace widget {
 
 class TaskbarPreview : public nsITaskbarPreview
 {
 public:
   TaskbarPreview(ITaskbarList4 *aTaskbar, nsITaskbarPreviewController *aController, HWND aHWND, nsIDocShell *aShell);
-  virtual ~TaskbarPreview();
 
   NS_DECL_NSITASKBARPREVIEW
 
 protected:
+  virtual ~TaskbarPreview();
+
   // Called to update ITaskbarList4 dependent properties
   virtual nsresult UpdateTaskbarProperties();
 
   // Invoked when the preview is made visible
   virtual nsresult Enable();
   // Invoked when the preview is made invisible
   virtual nsresult Disable();
 
--- a/widget/windows/TaskbarPreviewButton.h
+++ b/widget/windows/TaskbarPreviewButton.h
@@ -18,19 +18,20 @@
 #include <nsWeakReference.h>
 
 namespace mozilla {
 namespace widget {
 
 class TaskbarWindowPreview;
 class TaskbarPreviewButton : public nsITaskbarPreviewButton, public nsSupportsWeakReference
 {
+  virtual ~TaskbarPreviewButton();
+
 public: 
   TaskbarPreviewButton(TaskbarWindowPreview* preview, uint32_t index);
-  virtual ~TaskbarPreviewButton();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSITASKBARPREVIEWBUTTON
 
 private:
   THUMBBUTTON&            Button();
   nsresult                Update();
 
--- a/widget/windows/TaskbarTabPreview.h
+++ b/widget/windows/TaskbarTabPreview.h
@@ -12,19 +12,20 @@
 #include "TaskbarPreview.h"
 
 namespace mozilla {
 namespace widget {
 
 class TaskbarTabPreview : public nsITaskbarTabPreview,
                           public TaskbarPreview
 {
+  virtual ~TaskbarTabPreview();
+
 public:
   TaskbarTabPreview(ITaskbarList4 *aTaskbar, nsITaskbarPreviewController *aController, HWND aHWND, nsIDocShell *aShell);
-  virtual ~TaskbarTabPreview();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSITASKBARTABPREVIEW
   NS_FORWARD_NSITASKBARPREVIEW(TaskbarPreview::)
 
 private:
   virtual nsresult ShowActive(bool active);
   virtual HWND &PreviewWindow();
--- a/widget/windows/TaskbarWindowPreview.h
+++ b/widget/windows/TaskbarWindowPreview.h
@@ -19,19 +19,20 @@ namespace widget {
 
 class TaskbarPreviewButton;
 class TaskbarWindowPreview : public TaskbarPreview,
                              public nsITaskbarWindowPreview,
                              public nsITaskbarProgress,
                              public nsITaskbarOverlayIconController,
                              public nsSupportsWeakReference
 {
+  virtual ~TaskbarWindowPreview();
+
 public:
   TaskbarWindowPreview(ITaskbarList4 *aTaskbar, nsITaskbarPreviewController *aController, HWND aHWND, nsIDocShell *aShell);
-  virtual ~TaskbarWindowPreview();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSITASKBARWINDOWPREVIEW
   NS_DECL_NSITASKBARPROGRESS
   NS_DECL_NSITASKBAROVERLAYICONCONTROLLER
   NS_FORWARD_NSITASKBARPREVIEW(TaskbarPreview::)
 
   virtual LRESULT WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam);
--- a/widget/windows/WinTaskbar.cpp
+++ b/widget/windows/WinTaskbar.cpp
@@ -117,16 +117,17 @@ SetWindowAppUserModelProp(nsIDOMWindow *
   return rv;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // default nsITaskbarPreviewController
 
 class DefaultController MOZ_FINAL : public nsITaskbarPreviewController
 {
+  ~DefaultController() {}
   HWND mWnd;
 public:
   DefaultController(HWND hWnd) 
     : mWnd(hWnd)
   {
   }
 
   NS_DECL_ISUPPORTS
--- a/widget/windows/WinTaskbar.h
+++ b/widget/windows/WinTaskbar.h
@@ -14,19 +14,20 @@
 #include "nsIWinTaskbar.h"
 #include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace widget {
 
 class WinTaskbar MOZ_FINAL : public nsIWinTaskbar
 {
+  ~WinTaskbar();
+
 public: 
   WinTaskbar();
-  ~WinTaskbar();
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIWINTASKBAR
 
   // Registers the global app user model id for the instance.
   // See comments in WinTaskbar.cpp for more information.
   static bool RegisterAppUserModelID();
   static bool GetAppUserModelID(nsAString & aDefaultGroupId);