diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-04 13:17:38 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-04 13:17:38 +0200 |
commit | a1be17c1cea81ebb1e8b131a662c698d78f3f7f2 (patch) | |
tree | a92f7de513be600cc07bac458183e9af40e00c06 /browser/branding/shared | |
parent | bf11fdd304898ac675e39b01b280d39550e419d0 (diff) | |
download | UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar.gz UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar.lz UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.tar.xz UXP-a1be17c1cea81ebb1e8b131a662c698d78f3f7f2.zip |
Issue #303 Part 1: Move basilisk files from /browser to /application/basilisk
Diffstat (limited to 'browser/branding/shared')
-rw-r--r-- | browser/branding/shared/branding.mozbuild | 56 | ||||
-rw-r--r-- | browser/branding/shared/dsstore | bin | 12292 -> 0 bytes | |||
-rw-r--r-- | browser/branding/shared/newtab.ico | bin | 6518 -> 0 bytes | |||
-rw-r--r-- | browser/branding/shared/newwindow.ico | bin | 6518 -> 0 bytes | |||
-rw-r--r-- | browser/branding/shared/pbmode.ico | bin | 6518 -> 0 bytes | |||
-rw-r--r-- | browser/branding/shared/preferences.inc | 26 | ||||
-rw-r--r-- | browser/branding/shared/uaoverrides.inc | 42 |
7 files changed, 0 insertions, 124 deletions
diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild deleted file mode 100644 index e6fee3f4e..000000000 --- a/browser/branding/shared/branding.mozbuild +++ /dev/null @@ -1,56 +0,0 @@ -# -*- 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 ApplicationBranding(): - JS_PREFERENCE_PP_FILES += [ - 'pref/firefox-branding.js', - ] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - FINAL_TARGET_FILES['..'] += [ - 'basilisk.VisualElementsManifest.xml', - ] - FINAL_TARGET_FILES.VisualElements += [ - 'VisualElements_150.png', - 'VisualElements_70.png', - ] - BRANDING_FILES += [ - '../shared/newtab.ico', - '../shared/newwindow.ico', - '../shared/pbmode.ico', - 'appname.bmp', - 'branding.nsi', - 'document.ico', - 'firefox.ico', - 'wizHeader.bmp', - 'wizHeaderRTL.bmp', - 'wizWatermark.bmp', - ] - elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - BRANDING_FILES += [ - '../shared/dsstore', - 'background.png', - 'disk.icns', - 'document.icns', - 'firefox.icns', - ] - elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: - BRANDING_FILES += [ - 'default16.png', - 'default32.png', - 'default48.png', - 'mozicon128.png', - ] - FINAL_TARGET_FILES.icons += ['mozicon128.png'] - FINAL_TARGET_FILES.chrome.icons.default += [ - 'default16.png', - 'default32.png', - 'default48.png', - ] - DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] - DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] - DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U'] diff --git a/browser/branding/shared/dsstore b/browser/branding/shared/dsstore Binary files differdeleted file mode 100644 index 8ea703674..000000000 --- a/browser/branding/shared/dsstore +++ /dev/null diff --git a/browser/branding/shared/newtab.ico b/browser/branding/shared/newtab.ico Binary files differdeleted file mode 100644 index a9b37c08c..000000000 --- a/browser/branding/shared/newtab.ico +++ /dev/null diff --git a/browser/branding/shared/newwindow.ico b/browser/branding/shared/newwindow.ico Binary files differdeleted file mode 100644 index 553720771..000000000 --- a/browser/branding/shared/newwindow.ico +++ /dev/null diff --git a/browser/branding/shared/pbmode.ico b/browser/branding/shared/pbmode.ico Binary files differdeleted file mode 100644 index 47677c13f..000000000 --- a/browser/branding/shared/pbmode.ico +++ /dev/null diff --git a/browser/branding/shared/preferences.inc b/browser/branding/shared/preferences.inc deleted file mode 100644 index e1b8d3be6..000000000 --- a/browser/branding/shared/preferences.inc +++ /dev/null @@ -1,26 +0,0 @@ -// Interval: Time between checks for a new version (in seconds) -pref("app.update.interval", 86400); // 1 day - -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -// 0 means "download everything at once" -pref("app.update.download.backgroundInterval", 0); - -// Give the user x seconds to react before showing the big UI. default=192 hours -pref("app.update.promptWaitTime", 691200); - -// The number of days a binary is permitted to be old -// without checking for an update. This assumes that -// app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 14); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); - -// Number of usages of the web console or scratchpad. -// If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 100); - -// -pref("general.useragent.appVersionIsBuildID", true); diff --git a/browser/branding/shared/uaoverrides.inc b/browser/branding/shared/uaoverrides.inc deleted file mode 100644 index f7f7fafa3..000000000 --- a/browser/branding/shared/uaoverrides.inc +++ /dev/null @@ -1,42 +0,0 @@ -#define GUAO_PREF general.useragent.override
-
-#define GRE_VERSION @MOZILLA_UAVERSION_U@
-#define GRE_VERSION_SLICE Goanna/@GRE_VERSION@
-#define GRE_DATE_SLICE Goanna/20170101
-#define APP_SLICE Basilisk/@MOZ_APP_VERSION@
-
-#define GK_VERSION 52.9
-#define GK_SLICE Gecko/20100101
-#define FX_SLICE Firefox/@GK_VERSION@
-
-#ifdef XP_UNIX
-#ifndef XP_MACOSX
-#define OS_SLICE X11; Linux x86_64;
-#else
-#define OS_SLICE Macintosh; Intel Mac OS X 10.11;
-#endif
-#else
-#define OS_SLICE Windows NT 6.1; WOW64;
-#endif
-
-// Mozilla overrides
-pref("@GUAO_PREF@.accounts.firefox.com", "Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
-pref("@GUAO_PREF@.addons.mozilla.org", "Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
-
-// Required for domains that have proven unresponsive to requests from users
-
-// The never-ending Facebook debacle...
-
-// UA-Sniffing domains below are pending responses from their operators - temp workaround
-// Daily motion only likes strict Firefox UAs
-pref("@GUAO_PREF@.dailymotion.com","Mozilla/5.0 (@OS_SLICE@ rv:52.0) @GK_SLICE@ Firefox/52.0");
-
-// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc.
-
-// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)
-
-// UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon
-
-// The following domains do not like the Goanna slice
-pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
-pref("@GUAO_PREF@.yuku.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ @APP_SLICE@");
|