Bug 1189846 Part 2: Make Android CreatePrintSettings work like other OS specific ones. r=snorp
authorBob Owen <bobowencode@gmail.com>
Mon, 16 May 2016 10:40:54 +0100
changeset 336508 ece4ab0326116579d7b9097cb3c80cbf2501ad9b
parent 336507 01f780f3be075944a158d55b7fa1cb3b414859a2
child 336509 e673d44f5aa6f68a2b65382f0bfcbfc9a489e04a
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1189846
milestone49.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 1189846 Part 2: Make Android CreatePrintSettings work like other OS specific ones. r=snorp MozReview-Commit-ID: 7DyPINkdZbl
widget/android/nsPrintOptionsAndroid.cpp
widget/android/nsPrintOptionsAndroid.h
--- a/widget/android/nsPrintOptionsAndroid.cpp
+++ b/widget/android/nsPrintOptionsAndroid.cpp
@@ -20,17 +20,18 @@ public:
 nsPrintOptionsAndroid::nsPrintOptionsAndroid()
 {
 }
 
 nsPrintOptionsAndroid::~nsPrintOptionsAndroid()
 {
 }
 
-NS_IMETHODIMP nsPrintOptionsAndroid::CreatePrintSettings(nsIPrintSettings **_retval)
+nsresult
+nsPrintOptionsAndroid::_CreatePrintSettings(nsIPrintSettings** _retval)
 {
   nsPrintSettings * printSettings = new nsPrintSettingsAndroid();
   NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY);
   NS_ADDREF(*_retval = printSettings);
   (void)InitPrintSettingsFromPrefs(*_retval, false,
                                    nsIPrintSettings::kInitSaveAll);
   return NS_OK;
 }
--- a/widget/android/nsPrintOptionsAndroid.h
+++ b/widget/android/nsPrintOptionsAndroid.h
@@ -12,12 +12,12 @@
 //***    nsPrintOptions
 //*****************************************************************************
 class nsPrintOptionsAndroid : public nsPrintOptions
 {
 public:
   nsPrintOptionsAndroid();
   virtual ~nsPrintOptionsAndroid();
 
-  NS_IMETHOD CreatePrintSettings(nsIPrintSettings **_retval);
+  nsresult _CreatePrintSettings(nsIPrintSettings** _retval) override;
 };
 
 #endif /* nsPrintOptionsAndroid_h__ */