Backed out changeset a945f68d5a5a (bug 1289172) for ESLint failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Fri, 16 Sep 2016 16:12:42 -0700
changeset 348210 05c3dc5f50c058f86538dec09ecba9d555f47d19
parent 348209 a945f68d5a5a5e3999f250e6b15fd991aeb1d33e
child 348211 b9499912b32324acd84792bf02b533b40e98e496
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1289172
milestone50.0a2
backs outa945f68d5a5a5e3999f250e6b15fd991aeb1d33e
Backed out changeset a945f68d5a5a (bug 1289172) for ESLint failures a=backout
browser/app/profile/firefox.js
browser/branding/branding-common.mozbuild
browser/branding/official/pref/firefox-branding.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1469,21 +1469,17 @@ pref("toolkit.pageThumbs.minHeight", 190
 
 // Enable speech synthesis
 pref("media.webspeech.synth.enabled", true);
 
 pref("browser.esedbreader.loglevel", "Error");
 
 pref("browser.laterrun.enabled", false);
 
-#if MOZ_UPDATE_CHANNEL == beta
-pref("browser.migrate.automigrate.enabled", true);
-#else
 pref("browser.migrate.automigrate.enabled", false);
-#endif
 // 4 here means the suggestion notification will be automatically
 // hidden the 4th day, so it will actually be shown on 3 different days.
 pref("browser.migrate.automigrate.daysToOfferUndo", 4);
 pref("browser.migrate.automigrate.ui.enabled", true);
 
 // Enable browser frames for use on desktop.  Only exposed to chrome callers.
 pref("dom.mozBrowserFramesEnabled", true);
 
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/branding-common.mozbuild
@@ -1,24 +1,19 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 @template
 def FirefoxBranding():
-    if CONFIG['MOZ_BRANDING_DIRECTORY'] == 'browser/branding/official':
-        JS_PREFERENCE_PP_FILES += [
-            'pref/firefox-branding.js',
-        ]
-    else:
-        JS_PREFERENCE_FILES += [
-            'pref/firefox-branding.js',
-        ]
+    JS_PREFERENCE_FILES += [
+        'pref/firefox-branding.js',
+    ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         FINAL_TARGET_FILES['..'] += [
             'firefox.VisualElementsManifest.xml',
         ]
         FINAL_TARGET_FILES.VisualElements += [
             'VisualElements_150.png',
             'VisualElements_70.png',
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -1,20 +1,15 @@
 /* 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/. */
 
 pref("startup.homepage_override_url", "");
-#if MOZ_UPDATE_CHANNEL == beta
-pref("startup.homepage_welcome_url", "");
-pref("startup.homepage_welcome_url.additional", "");
-#else
 pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/");
 pref("startup.homepage_welcome_url.additional", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/learnmore/");
-#endif
 // Interval: Time between checks for a new version (in seconds)
 pref("app.update.interval", 43200); // 12 hours
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 // Give the user x seconds to react before showing the big UI. default=192 hours
 pref("app.update.promptWaitTime", 691200);
 // URL user can browse to manually if for some reason all update installation