Bug 1530700: Add a missing ifdef MOZ_LAUNCHER_PROCESS block; r=mhowell
authorAaron Klotz <aklotz@mozilla.com>
Wed, 27 Feb 2019 11:00:14 +0000
changeset 519375 5be3bd53aaade28dbe7c92f1c6174fd303fda3bf
parent 519374 86bed3fcf6f50e90e64cbde7b67659a267d6b955
child 519376 a20d059fc98bb69acfbe2c18b9a51ba8b920d072
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell
bugs1530700
milestone67.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 1530700: Add a missing ifdef MOZ_LAUNCHER_PROCESS block; r=mhowell Differential Revision: https://phabricator.services.mozilla.com/D21258
browser/app/winlauncher/ErrorHandler.cpp
--- a/browser/app/winlauncher/ErrorHandler.cpp
+++ b/browser/app/winlauncher/ErrorHandler.cpp
@@ -677,26 +677,28 @@ static unsigned __stdcall SendPingThread
 
   return 0;
 }
 
 #endif  // defined(MOZ_TELEMETRY_REPORTING)
 
 static bool SendPing(const mozilla::LauncherError& aError) {
 #if defined(MOZ_TELEMETRY_REPORTING)
+#if defined(MOZ_LAUNCHER_PROCESS)
   mozilla::LauncherRegistryInfo regInfo;
   mozilla::LauncherResult<mozilla::LauncherRegistryInfo::EnabledState>
       launcherEnabled = regInfo.IsEnabled();
   if (launcherEnabled.isErr() ||
       launcherEnabled.unwrap() ==
           mozilla::LauncherRegistryInfo::EnabledState::ForceDisabled) {
     // If the launcher is force disabled, we do not send any pings
     // (since studies and thus telemetry have been opted out)
     return false;
   }
+#endif  // defined(MOZ_LAUNCHER_PROCESS)
 
   // Capture aError and our module list into context for processing on another
   // thread.
   auto thdParam = mozilla::MakeUnique<PingThreadContext>(aError);
 
   // The ping does a lot of file I/O. Since we want this thread to continue
   // executing browser startup, we should gather that information on a
   // background thread.