1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent 8a401a01454e9f5e8a357262d774e0ff348d9bc1 |
3 # Parent b75f4c79d0757cd16065811d34a563bdb5cfb15e |
4 |
4 |
5 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
5 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
6 --- a/browser/branding/branding-common.mozbuild |
6 --- a/browser/branding/branding-common.mozbuild |
7 +++ b/browser/branding/branding-common.mozbuild |
7 +++ b/browser/branding/branding-common.mozbuild |
8 @@ -22,12 +22,15 @@ def FirefoxBranding(): |
8 @@ -22,12 +22,15 @@ def FirefoxBranding(): |
9 FINAL_TARGET_FILES.VisualElements += [ |
9 FINAL_TARGET_FILES.VisualElements += [ |
10 'VisualElements_150.png', |
10 'VisualElements_150.png', |
11 'VisualElements_70.png', |
11 'VisualElements_70.png', |
12 ] |
12 ] |
13 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
13 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
14 FINAL_TARGET_FILES.chrome.icons.default += [ |
14 FINAL_TARGET_FILES.chrome.icons.default += [ |
15 'default128.png', |
15 'default128.png', |
16 'default16.png', |
16 'default16.png', |
17 + 'default22.png', |
17 + 'default22.png', |
18 + 'default24.png', |
18 + 'default24.png', |
19 + 'default256.png', |
19 + 'default256.png', |
20 'default32.png', |
20 'default32.png', |
21 'default48.png', |
21 'default48.png', |
22 'default64.png', |
22 'default64.png', |
23 ] |
23 ] |
24 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
24 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
25 --- a/browser/installer/package-manifest.in |
25 --- a/browser/installer/package-manifest.in |
26 +++ b/browser/installer/package-manifest.in |
26 +++ b/browser/installer/package-manifest.in |
27 @@ -404,20 +404,23 @@ |
27 @@ -246,20 +246,23 @@ |
28 @RESPATH@/browser/chrome/pdfjs.manifest |
28 @RESPATH@/browser/chrome/pdfjs.manifest |
29 @RESPATH@/browser/chrome/pdfjs/* |
29 @RESPATH@/browser/chrome/pdfjs/* |
30 @RESPATH@/chrome/toolkit@JAREXT@ |
30 @RESPATH@/chrome/toolkit@JAREXT@ |
31 @RESPATH@/chrome/toolkit.manifest |
31 @RESPATH@/chrome/toolkit.manifest |
32 @RESPATH@/chrome/recording.manifest |
32 @RESPATH@/chrome/recording.manifest |