@@ -26,11 +26,18 @@ XPCOMUtils.defineLazyModuleGetters(this, {
26
26
ShellService : "resource:///modules/ShellService.jsm" ,
27
27
UpdatePing : "resource://gre/modules/UpdatePing.jsm" ,
28
28
} ) ;
29
- XPCOMUtils . defineLazyServiceGetters ( this , {
30
- UpdateManager : [ "@mozilla.org/updates/update-manager;1" , "nsIUpdateManager" ] ,
31
- WinTaskbar : [ "@mozilla.org/windows-taskbar;1" , "nsIWinTaskbar" ] ,
32
- WindowsUIUtils : [ "@mozilla.org/windows-ui-utils;1" , "nsIWindowsUIUtils" ] ,
33
- } ) ;
29
+ XPCOMUtils . defineLazyServiceGetter (
30
+ this ,
31
+ "WindowsUIUtils" ,
32
+ "@mozilla.org/windows-ui-utils;1" ,
33
+ "nsIWindowsUIUtils"
34
+ ) ;
35
+ XPCOMUtils . defineLazyServiceGetter (
36
+ this ,
37
+ "UpdateManager" ,
38
+ "@mozilla.org/updates/update-manager;1" ,
39
+ "nsIUpdateManager"
40
+ ) ;
34
41
35
42
XPCOMUtils . defineLazyGetter ( this , "gSystemPrincipal" , ( ) =>
36
43
Services . scriptSecurityManager . getSystemPrincipal ( )
@@ -41,11 +48,6 @@ XPCOMUtils.defineLazyGlobalGetters(this, [URL]);
41
48
const ONCE_DOMAINS = [ "mozilla.org" , "firefox.com" ] ;
42
49
const ONCE_PREF = "browser.startup.homepage_override.once" ;
43
50
44
- // Index of Private Browsing icon in firefox.exe
45
- // Must line up with the one in nsNativeAppSupportWin.h.
46
- const PRIVATE_BROWSING_ICON_INDEX = 5 ;
47
- const PRIVACY_SEGMENTATION_PREF = "browser.privacySegmentation.enabled" ;
48
-
49
51
function shouldLoadURI ( aURI ) {
50
52
if ( aURI && ! aURI . schemeIs ( "chrome" ) ) {
51
53
return true ;
@@ -274,20 +276,6 @@ function openBrowserWindow(
274
276
win . docShell . QueryInterface (
275
277
Ci . nsILoadContext
276
278
) . usePrivateBrowsing = true ;
277
- if ( Services . prefs . getBoolPref ( PRIVACY_SEGMENTATION_PREF ) ) {
278
- // TODO: Changing this after the Window has been painted causes it to
279
- // change Taskbar icons if the original one had a different AUMID.
280
- // This must stay pref'ed off until this is resolved.
281
- // https://bugzilla.mozilla.org/show_bug.cgi?id=1751010
282
- WinTaskbar . setGroupIdForWindow ( win , WinTaskbar . defaultPrivateGroupId ) ;
283
- WindowsUIUtils . setWindowIconFromExe (
284
- win ,
285
- Services . dirsvc . get ( "XREExeF" , Ci . nsIFile ) . path ,
286
- // This corresponds to the definitions in
287
- // nsNativeAppSupportWin.h
288
- PRIVATE_BROWSING_ICON_INDEX
289
- ) ;
290
- }
291
279
}
292
280
293
281
let openTime = win . openTime ;
0 commit comments