mozilla-central: changeset 225623:205717a8d35e992579a9920138330a28717fae7d

author	Daniel Holbert <dholbert@cs.stanford.edu>
	Sun, 25 Jan 2015 15:16:25 -0800
changeset 225623	205717a8d35e992579a9920138330a28717fae7d
parent 225622	6ff2bc5f6f0ca530b200fa39ea9806aab504065a
child 225624	49b107ba5bee3c805356e64d7e2fde7b03b727d5
push id	28172
push user	cbook@mozilla.com
push date	Mon, 26 Jan 2015 13:09:46 +0000
treeherder	mozilla-central@4368f3945690 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	karlt
bugs	1125638
milestone	38.0a1
first release with	nightly linux32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly linux64 38e4719e71af / 38.0a1 / 20150127030230 / files nightly mac 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win64 38e4719e71af / 38.0a1 / 20150127030230 / files
last release without	nightly linux32 fa91879c8428 / 38.0a1 / 20150126030202 / files nightly linux64 fa91879c8428 / 38.0a1 / 20150126030202 / files nightly mac fa91879c8428 / 38.0a1 / 20150126030202 / files nightly win32 fa91879c8428 / 38.0a1 / 20150126030202 / files nightly win64 fa91879c8428 / 38.0a1 / 20150126030202 / files

--- a/toolkit/components/remote/nsGTKRemoteService.h
+++ b/toolkit/components/remote/nsGTKRemoteService.h
@@ -40,15 +40,15 @@ private:
 
 
   static gboolean HandlePropertyChange(GtkWidget *widget,
                                        GdkEventProperty *event,
                                        nsIWeakReference* aThis);
 
 
   virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
-                                              uint32_t aTimestamp);
+                                              uint32_t aTimestamp) MOZ_OVERRIDE;
 
   nsInterfaceHashtable<nsPtrHashKey<GtkWidget>, nsIWeakReference> mWindows;
   GtkWidget* mServerWindow;  
 };
 
 #endif // __nsGTKRemoteService_h__

--- a/toolkit/components/remote/nsQtRemoteService.h
+++ b/toolkit/components/remote/nsQtRemoteService.h
@@ -21,17 +21,17 @@ public:
   NS_DECL_NSIREMOTESERVICE  
 
   nsQtRemoteService();
 
 private:
   virtual ~nsQtRemoteService();
 
   virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
-                                              uint32_t aTimestamp);
+                                              uint32_t aTimestamp) MOZ_OVERRIDE;
 
   void PropertyNotifyEvent(XEvent *evt);
   friend class MozQRemoteEventHandlerWidget;
 
   QWindow *mServerWindow;
 };
 
 #endif // __nsQtRemoteService_h__

toolkit/components/remote/nsGTKRemoteService.h		file \| annotate \| diff \| comparison \| revisions
toolkit/components/remote/nsQtRemoteService.h		file \| annotate \| diff \| comparison \| revisions