Bug 144114 part 1 - Rename the files for nsPrintOptions and its subclasses. r=bobowen
authorJonathan Watt <jwatt@jwatt.org>
Tue, 19 Dec 2017 10:06:39 +0000
changeset 453510 d7a4884fbc25e2cc2895b5e115960d26b927201b
parent 453505 fafb731dae7c13cf972b8fa94ea584bcc9b9bbfd
child 453511 2453d0c0d5acc940b6aacef3d32d9b120b80d36f
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen
bugs144114
milestone59.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 144114 part 1 - Rename the files for nsPrintOptions and its subclasses. r=bobowen MozReview-Commit-ID: EcotGH6pXCR
toolkit/components/printingui/ipc/nsPrintingProxy.cpp
widget/android/moz.build
widget/android/nsPrintOptionsAndroid.cpp
widget/android/nsPrintOptionsAndroid.h
widget/android/nsPrintSettingsServiceAndroid.cpp
widget/android/nsPrintSettingsServiceAndroid.h
widget/android/nsWidgetFactory.cpp
widget/cocoa/moz.build
widget/cocoa/nsPrintOptionsX.h
widget/cocoa/nsPrintOptionsX.mm
widget/cocoa/nsPrintSettingsServiceX.h
widget/cocoa/nsPrintSettingsServiceX.mm
widget/cocoa/nsWidgetFactory.mm
widget/gtk/moz.build
widget/gtk/nsPrintOptionsGTK.cpp
widget/gtk/nsPrintOptionsGTK.h
widget/gtk/nsPrintSettingsServiceGTK.cpp
widget/gtk/nsPrintSettingsServiceGTK.h
widget/gtk/nsWidgetFactory.cpp
widget/moz.build
widget/nsPrintOptionsImpl.cpp
widget/nsPrintOptionsImpl.h
widget/nsPrintSettingsService.cpp
widget/nsPrintSettingsService.h
widget/windows/moz.build
widget/windows/nsPrintOptionsWin.cpp
widget/windows/nsPrintOptionsWin.h
widget/windows/nsPrintSettingsServiceWin.cpp
widget/windows/nsPrintSettingsServiceWin.h
widget/windows/nsWidgetFactory.cpp
--- a/toolkit/components/printingui/ipc/nsPrintingProxy.cpp
+++ b/toolkit/components/printingui/ipc/nsPrintingProxy.cpp
@@ -11,17 +11,17 @@
 #include "mozilla/dom/TabChild.h"
 #include "mozilla/layout/RemotePrintJobChild.h"
 #include "mozilla/Unused.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIPrintingPromptService.h"
 #include "nsIPrintSession.h"
 #include "nsPIDOMWindow.h"
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 #include "nsServiceManagerUtils.h"
 #include "PrintDataUtils.h"
 #include "PrintProgressDialogChild.h"
 #include "PrintSettingsDialogChild.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::embedding;
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -46,17 +46,17 @@ UNIFIED_SOURCES += [
     'GfxInfo.cpp',
     'nsAndroidProtocolHandler.cpp',
     'nsAppShell.cpp',
     'nsClipboard.cpp',
     'nsDeviceContextAndroid.cpp',
     'nsIdleServiceAndroid.cpp',
     'nsLookAndFeel.cpp',
     'nsNativeThemeAndroid.cpp',
-    'nsPrintOptionsAndroid.cpp',
+    'nsPrintSettingsServiceAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
rename from widget/android/nsPrintOptionsAndroid.cpp
rename to widget/android/nsPrintSettingsServiceAndroid.cpp
--- a/widget/android/nsPrintOptionsAndroid.cpp
+++ b/widget/android/nsPrintSettingsServiceAndroid.cpp
@@ -1,13 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "nsPrintOptionsAndroid.h"
+#include "nsPrintSettingsServiceAndroid.h"
 
 #include "nsPrintSettingsImpl.h"
 
 class nsPrintSettingsAndroid : public nsPrintSettings {
 public:
   nsPrintSettingsAndroid()
   {
     // The aim here is to set up the objects enough that silent printing works
rename from widget/android/nsPrintOptionsAndroid.h
rename to widget/android/nsPrintSettingsServiceAndroid.h
--- a/widget/android/nsPrintOptionsAndroid.h
+++ b/widget/android/nsPrintSettingsServiceAndroid.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef nsPrintOptionsAndroid_h__
 #define nsPrintOptionsAndroid_h__
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 #include "nsIPrintSettings.h"
 
 //*****************************************************************************
 //***    nsPrintOptions
 //*****************************************************************************
 class nsPrintOptionsAndroid : public nsPrintOptions
 {
 public:
--- a/widget/android/nsWidgetFactory.cpp
+++ b/widget/android/nsWidgetFactory.cpp
@@ -15,18 +15,18 @@
 #include "nsLookAndFeel.h"
 #include "nsAppShellSingleton.h"
 #include "nsScreenManagerAndroid.h"
 
 #include "nsIdleServiceAndroid.h"
 #include "nsClipboard.h"
 #include "nsClipboardHelper.h"
 #include "nsTransferable.h"
-#include "nsPrintOptionsAndroid.h"
 #include "nsPrintSession.h"
+#include "nsPrintSettingsServiceAndroid.h"
 #include "nsDeviceContextAndroid.h"
 #include "nsHTMLFormatConverter.h"
 #include "nsXULAppAPI.h"
 #include "nsAndroidProtocolHandler.h"
 
 #include "nsToolkitCompsCID.h"
 #include "AndroidAlerts.h"
 #include "nsNativeThemeAndroid.h"
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -42,17 +42,17 @@ UNIFIED_SOURCES += [
     'nsMacWebAppUtils.mm',
     'nsMenuBarX.mm',
     'nsMenuGroupOwnerX.mm',
     'nsMenuItemIconX.mm',
     'nsMenuItemX.mm',
     'nsMenuUtilsX.mm',
     'nsMenuX.mm',
     'nsPrintDialogX.mm',
-    'nsPrintOptionsX.mm',
+    'nsPrintSettingsServiceX.mm',
     'nsPrintSettingsX.mm',
     'nsSound.mm',
     'nsStandaloneNativeMenu.mm',
     'nsSystemStatusBarCocoa.mm',
     'nsToolkit.mm',
     'nsWidgetFactory.mm',
     'nsWindowMap.mm',
     'OSXNotificationCenter.mm',
rename from widget/cocoa/nsPrintOptionsX.h
rename to widget/cocoa/nsPrintSettingsServiceX.h
--- a/widget/cocoa/nsPrintOptionsX.h
+++ b/widget/cocoa/nsPrintSettingsServiceX.h
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsPrintOptionsX_h_
 #define nsPrintOptionsX_h_
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 
 namespace mozilla
 {
 namespace embedding
 {
   class PrintData;
 } // namespace embedding
 } // namespace mozilla
rename from widget/cocoa/nsPrintOptionsX.mm
rename to widget/cocoa/nsPrintSettingsServiceX.mm
--- a/widget/cocoa/nsPrintOptionsX.mm
+++ b/widget/cocoa/nsPrintSettingsServiceX.mm
@@ -1,17 +1,18 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "nsPrintSettingsServiceX.h"
+
 #include "nsCOMPtr.h"
 #include "nsQueryObject.h"
 #include "nsIServiceManager.h"
-#include "nsPrintOptionsX.h"
 #include "nsPrintSettingsX.h"
 #include "nsIWebBrowserPrint.h"
 #include "nsCocoaUtils.h"
 
 using namespace mozilla::embedding;
 
 nsPrintOptionsX::nsPrintOptionsX()
 {
--- a/widget/cocoa/nsWidgetFactory.mm
+++ b/widget/cocoa/nsWidgetFactory.mm
@@ -30,17 +30,17 @@
 #include "nsLookAndFeel.h"
 
 #include "nsSound.h"
 #include "nsIdleServiceX.h"
 #include "NativeKeyBindings.h"
 #include "OSXNotificationCenter.h"
 
 #include "nsDeviceContextSpecX.h"
-#include "nsPrintOptionsX.h"
+#include "nsPrintSettingsServiceX.h"
 #include "nsPrintDialogX.h"
 #include "nsPrintSession.h"
 #include "nsToolkitCompsCID.h"
 
 #include "mozilla/widget/ScreenManager.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -66,18 +66,18 @@ if CONFIG['MOZ_X11']:
         'InProcessGtkCompositorWidget.h',
     ]
 
 if CONFIG['NS_PRINTING']:
     UNIFIED_SOURCES += [
         'nsCUPSShim.cpp',
         'nsDeviceContextSpecG.cpp',
         'nsPrintDialogGTK.cpp',
-        'nsPrintOptionsGTK.cpp',
         'nsPrintSettingsGTK.cpp',
+        'nsPrintSettingsServiceGTK.cpp',
         'nsPSPrinters.cpp',
     ]
 
 if CONFIG['MOZ_X11']:
     UNIFIED_SOURCES += [
         'nsClipboard.cpp',
         'nsClipboardX11.cpp',
         'nsDragService.cpp',
rename from widget/gtk/nsPrintOptionsGTK.cpp
rename to widget/gtk/nsPrintSettingsServiceGTK.cpp
--- a/widget/gtk/nsPrintOptionsGTK.cpp
+++ b/widget/gtk/nsPrintSettingsServiceGTK.cpp
@@ -1,14 +1,14 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsPrintOptionsGTK.h"
+#include "nsPrintSettingsServiceGTK.h"
 #include "nsPrintSettingsGTK.h"
 
 using namespace mozilla::embedding;
 
 /** ---------------------------------------------------
  *  See documentation in nsPrintOptionsWin.h
  *	@update 6/21/00 dwc
  */
rename from widget/gtk/nsPrintOptionsGTK.h
rename to widget/gtk/nsPrintSettingsServiceGTK.h
--- a/widget/gtk/nsPrintOptionsGTK.h
+++ b/widget/gtk/nsPrintSettingsServiceGTK.h
@@ -2,17 +2,17 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsPrintOptionsGTK_h__
 #define nsPrintOptionsGTK_h__
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 
 namespace mozilla
 {
 namespace embedding
 {
   class PrintData;
 } // namespace embedding
 } // namespace mozilla
--- a/widget/gtk/nsWidgetFactory.cpp
+++ b/widget/gtk/nsWidgetFactory.cpp
@@ -29,17 +29,17 @@
 #include "nsColorPicker.h"
 #include "nsFilePicker.h"
 #include "nsSound.h"
 #include "nsBidiKeyboard.h"
 #include "nsGTKToolkit.h"
 #include "WakeLockListener.h"
 
 #ifdef NS_PRINTING
-#include "nsPrintOptionsGTK.h"
+#include "nsPrintSettingsServiceGTK.h"
 #include "nsPrintSession.h"
 #include "nsDeviceContextSpecG.h"
 #endif
 
 #include "nsImageToPixbuf.h"
 #include "nsPrintDialogGTK.h"
 
 #if defined(MOZ_X11)
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -209,22 +209,22 @@ if CONFIG['OS_ARCH'] == 'Linux':
     ]
     SOURCES += [
         'LSBUtils.cpp'
     ]
 
 if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
     EXPORTS += [
         'nsDeviceContextSpecProxy.h',
-        'nsPrintOptionsImpl.h',
+        'nsPrintSettingsService.h',
     ]
     UNIFIED_SOURCES += [
         'nsDeviceContextSpecProxy.cpp',
-        'nsPrintOptionsImpl.cpp',
         'nsPrintSession.cpp',
+        'nsPrintSettingsService.cpp',
     ]
 
 # nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers
 # nsBaseDragService.cpp moved out of UNIFIED to fix xgill crash (bug 1259850) after moving widget/ContentHelper -> apz/util/TouchActionHelper
 SOURCES += [
     'nsBaseDragService.cpp',
     'nsBaseWidget.cpp',
 ]
rename from widget/nsPrintOptionsImpl.cpp
rename to widget/nsPrintSettingsService.cpp
--- a/widget/nsPrintOptionsImpl.cpp
+++ b/widget/nsPrintSettingsService.cpp
@@ -1,14 +1,14 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 
 #include "mozilla/embedding/PPrinting.h"
 #include "mozilla/layout/RemotePrintJobChild.h"
 #include "mozilla/RefPtr.h"
 #include "nsIPrinterEnumerator.h"
 #include "nsPrintingProxy.h"
 #include "nsReadableUtils.h"
 #include "nsPrintSettingsImpl.h"
rename from widget/nsPrintOptionsImpl.h
rename to widget/nsPrintSettingsService.h
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -93,17 +93,17 @@ SOURCES += [
     'WinMouseScrollHandler.cpp',
 ]
 
 if CONFIG['NS_PRINTING']:
     UNIFIED_SOURCES += [
         'nsDeviceContextSpecWin.cpp',
         'nsPrintDialogUtil.cpp',
         'nsPrintDialogWin.cpp',
-        'nsPrintOptionsWin.cpp',
+        'nsPrintSettingsServiceWin.cpp',
         'nsPrintSettingsWin.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA_PDF']:
     DIRS += ['/modules/pdfium']
     IPDL_SOURCES += [
         'PPDFium.ipdl',
     ]
rename from widget/windows/nsPrintOptionsWin.cpp
rename to widget/windows/nsPrintSettingsServiceWin.cpp
--- a/widget/windows/nsPrintOptionsWin.cpp
+++ b/widget/windows/nsPrintSettingsServiceWin.cpp
@@ -1,14 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsPrintSettingsServiceWin.h"
+
 #include "nsCOMPtr.h"
-#include "nsPrintOptionsWin.h"
 #include "nsPrintSettingsWin.h"
 #include "nsPrintDialogUtil.h"
 
 #include "nsGfxCIID.h"
 #include "nsIServiceManager.h"
 #include "nsIWebBrowserPrint.h"
 #include "nsWindowsHelpers.h"
 #include "ipc/IPCMessageUtils.h"
rename from widget/windows/nsPrintOptionsWin.h
rename to widget/windows/nsPrintSettingsServiceWin.h
--- a/widget/windows/nsPrintOptionsWin.h
+++ b/widget/windows/nsPrintSettingsServiceWin.h
@@ -3,17 +3,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsPrintOptionsWin_h__
 #define nsPrintOptionsWin_h__
 
 #include "mozilla/embedding/PPrinting.h"
-#include "nsPrintOptionsImpl.h"  
+#include "nsPrintSettingsService.h"
 
 class nsIPrintSettings;
 class nsIWebBrowserPrint;
 
 //*****************************************************************************
 //***    nsPrintOptions
 //*****************************************************************************
 class nsPrintOptionsWin : public nsPrintOptions
--- a/widget/windows/nsWidgetFactory.cpp
+++ b/widget/windows/nsWidgetFactory.cpp
@@ -45,17 +45,17 @@
 #include "JumpListBuilder.h"
 #include "JumpListItem.h"
 
 #include "WindowsUIUtils.h"
 
 #ifdef NS_PRINTING
 #include "nsDeviceContextSpecWin.h"
 #include "nsPrintDialogWin.h"
-#include "nsPrintOptionsWin.h"
+#include "nsPrintSettingsServiceWin.h"
 #include "nsPrintSession.h"
 #endif
 
 using namespace mozilla;
 using namespace mozilla::widget;
 
 static nsresult
 WindowConstructor(nsISupports *aOuter, REFNSIID aIID,