1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent 75308bbaaf73d672c88cb283591d4aefc7db9804 |
3 # Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa |
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 @@ -38,18 +38,24 @@ def FirefoxBranding(): |
8 @@ -17,12 +17,15 @@ def FirefoxBranding(): |
9 'disk.icns', |
9 FINAL_TARGET_FILES.VisualElements += [ |
10 'document.icns', |
10 'VisualElements_150.png', |
11 'dsstore', |
11 'VisualElements_70.png', |
12 'firefox.icns', |
|
13 ] |
12 ] |
14 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
13 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
15 BRANDING_FILES += [ |
14 FINAL_TARGET_FILES.chrome.icons.default += [ |
|
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 'mozicon128.png', |
22 'default64.png', |
23 ] |
|
24 FINAL_TARGET_FILES.icons += ['mozicon128.png'] |
|
25 FINAL_TARGET_FILES.chrome.icons.default += [ |
|
26 'default16.png', |
|
27 + 'default22.png', |
|
28 + 'default24.png', |
|
29 + 'default256.png', |
|
30 'default32.png', |
|
31 'default48.png', |
|
32 ] |
23 ] |
33 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 |
34 --- a/browser/installer/package-manifest.in |
25 --- a/browser/installer/package-manifest.in |
35 +++ b/browser/installer/package-manifest.in |
26 +++ b/browser/installer/package-manifest.in |
36 @@ -618,18 +618,21 @@ |
27 @@ -601,20 +601,23 @@ |
37 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest |
28 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest |
38 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
29 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
39 @RESPATH@/chrome/toolkit@JAREXT@ |
30 @RESPATH@/chrome/toolkit@JAREXT@ |
40 @RESPATH@/chrome/toolkit.manifest |
31 @RESPATH@/chrome/toolkit.manifest |
41 @RESPATH@/chrome/recording.manifest |
32 @RESPATH@/chrome/recording.manifest |
44 @RESPATH@/browser/chrome/icons/default/default16.png |
35 @RESPATH@/browser/chrome/icons/default/default16.png |
45 +@RESPATH@/browser/chrome/icons/default/default22.png |
36 +@RESPATH@/browser/chrome/icons/default/default22.png |
46 +@RESPATH@/browser/chrome/icons/default/default24.png |
37 +@RESPATH@/browser/chrome/icons/default/default24.png |
47 @RESPATH@/browser/chrome/icons/default/default32.png |
38 @RESPATH@/browser/chrome/icons/default/default32.png |
48 @RESPATH@/browser/chrome/icons/default/default48.png |
39 @RESPATH@/browser/chrome/icons/default/default48.png |
|
40 @RESPATH@/browser/chrome/icons/default/default64.png |
|
41 @RESPATH@/browser/chrome/icons/default/default128.png |
49 +@RESPATH@/browser/chrome/icons/default/default256.png |
42 +@RESPATH@/browser/chrome/icons/default/default256.png |
50 #endif |
43 #endif |
51 @RESPATH@/browser/features/* |
44 @RESPATH@/browser/features/* |
52 |
45 |
53 ; [Webide Files] |
46 ; [Webide Files] |