Merged origin/main into main

groene · Nov 24, 2023 · 1fde47f · 1fde47f
2 parents 9859588 + 5a74be1
commit 1fde47f
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 8 deletions.
diff --git a/data/ggl_all.rds b/data/ggl_all.rds
diff --git a/data/ggl_all7.rds b/data/ggl_all7.rds
diff --git a/data/ggl_sel_sp.rds b/data/ggl_sel_sp.rds
diff --git a/data/ggl_spend.rds b/data/ggl_spend.rds
diff --git a/out/Telemetry.ShutdownTime.txt b/out/Telemetry.ShutdownTime.txt
@@ -1 +1 @@
-119
+112
diff --git a/...porting/archived/2023-11/1700806134871.88a58fcb-4921-4598-b8e1-4d88333b020d.event.jsonlz4 b/...porting/archived/2023-11/1700806134871.88a58fcb-4921-4598-b8e1-4d88333b020d.event.jsonlz4
diff --git a/...eporting/archived/2023-11/1700806134898.9e8c6e10-81f9-465c-bda1-a5dd5a559db7.main.jsonlz4 b/...eporting/archived/2023-11/1700806134898.9e8c6e10-81f9-465c-bda1-a5dd5a559db7.main.jsonlz4
diff --git a/...g/archived/2023-11/1700822804369.aa509d9f-4802-4784-904b-4ed407c7cfa2.new-profile.jsonlz4 b/...g/archived/2023-11/1700822804369.aa509d9f-4802-4784-904b-4ed407c7cfa2.new-profile.jsonlz4
diff --git a/...porting/archived/2023-11/1700822804371.64b41b16-fa4e-44d6-83e2-b718b6bb14a9.event.jsonlz4 b/...porting/archived/2023-11/1700822804371.64b41b16-fa4e-44d6-83e2-b718b6bb14a9.event.jsonlz4
diff --git a/...eporting/archived/2023-11/1700822804386.29d5fcd2-c8c9-4018-97a0-ac2aa039c50c.main.jsonlz4 b/...eporting/archived/2023-11/1700822804386.29d5fcd2-c8c9-4018-97a0-ac2aa039c50c.main.jsonlz4
diff --git a/out/datareporting/session-state.json b/out/datareporting/session-state.json
@@ -0,0 +1 @@
+{"sessionId":"e0e21e9b-6f29-4734-bc30-a186a83726bb","subsessionId":"1a38201e-e9b5-4dfd-9227-2da2b55140e7","profileSubsessionCounter":1,"newProfilePingSent":true}
diff --git a/out/prefs.js b/out/prefs.js
@@ -20,7 +20,7 @@ user_pref("app.update.disabledForTesting", true);
 user_pref("app.update.enabled", false);
 user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1700802315);
 user_pref("app.update.lastUpdateTime.background-update-timer", 1700802315);
-user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1700806008);
+user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1700822553);
 user_pref("app.update.lastUpdateTime.region-update-timer", 1700802315);
 user_pref("app.update.lastUpdateTime.services-settings-poll-changes", 1700802315);
 user_pref("app.update.lastUpdateTime.telemetry_modules_ping", 1700802343);
@@ -61,14 +61,14 @@ user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.startup.couldRestoreSession.count", 2);
 user_pref("browser.startup.homepage", "about:blank");
 user_pref("browser.startup.homepage_override.mstone", "ignore");
-user_pref("browser.startup.lastColdStartupCheck", 1700805858);
+user_pref("browser.startup.lastColdStartupCheck", 1700822524);
 user_pref("browser.startup.page", 0);
 user_pref("browser.tabs.disableBackgroundZombification", false);
 user_pref("browser.tabs.warnOnCloseOtherTabs", false);
 user_pref("browser.tabs.warnOnOpen", false);
-user_pref("browser.topsites.contile.cacheValidFor", 10707);
-user_pref("browser.topsites.contile.cachedTiles", "[{\"id\":74301,\"name\":\"Amazon\",\"url\":\"https://www.amazon.com/blackfriday/?tag=admarketus-20&ref=pd_sl_bb4fd64d0b19d93bccc30ba186f9c8ebaacc647322e13e56cfc4523b&mfadid=adm\",\"click_url\":\"https://bridge.sfo1.ap01.net/ctp?version=16.0.0&key=1700804657400500002.1&ci=1700804657273.12791&ctag=pd_sl_bb4fd64d0b19d93bccc30ba186f9c8ebaacc647322e13e56cfc4523b\",\"image_url\":\"https://contile-images.services.mozilla.com/obgoOYObjIFea_bXuT6L4LbBJ8j425AD87S1HMD3BWg.9991.jpg\",\"image_size\":200,\"impression_url\":\"https://imp.mt48.net/static?id=7RHzfOIXjFEYsBdvIpkX4ZbW1pbk4QDr4pbW4CbWfpbY7ReNxR3UIG8zInwYIFIVs9eYiGINHrwkiFXwxYIZjF8XgClWfC2X7R4dHQ8zJnErj%3DcO7R4dHQfz4Z2ZfplnHG3Z5FwqgCfX1p8d4Cxr1BINI9HuiF2z4Z2ZfplnHmcux%3DcvImauiF2zfQlWfp2%2B7ncqIr7VjGbuiF2zfCfk4Qxr4Qfnj9wWIBdvIpkY7R4TJr2uJREuHnEYgClnHr7wHG3vjnDuiF2zfCbY4BIWJ%3DcQIFdwJR2uiF2zfCbW4Wyy\"},{\"id\":74896,\"name\":\"Home Depot\",\"url\":\"https://www.homedepot.com/?mtc=SEM-BF-CDP-AMP-Multi-Multi-NA-NA-NA-MULTI-NA-NA-NA-NA-BT2-NA-NA-NA-Brand_Privacy&cm_mmc=SEM-BF-CDP-AMP-Multi-Multi-NA-NA-NA-MULTI-NA-NA-NA-NA-BT2-NA-NA-NA-Brand_Privacy_amp1700804657400500002&mfadid=adm\",\"click_url\":\"https://bridge.sfo1.admarketplace.net/ctp?version=16.0.0&key=1700804657400500002.2&ci=1700804657273.12791&ctag=1700804657400500002\",\"image_url\":\"https://contile-images.services.mozilla.com/UV9WZ3FyH_HycbEWYC69D0vgspxXd9JmjStFfGbjJX0.11415.jpg\",\"image_size\":200,\"impression_url\":\"https://imp.mt48.net/static?id=7RHzfOIXjFEYsBdvIpkX4ZbW1pbk4QDr4pbW4CbWfpbY7ReNxR3UIG8zInwYIFIVs9eYiGINHrwkiFXwxYIZjF8XgClWfC2X7R4dHQ8zJnErj%3DcO7R4dHQfz4Z2a1CHnHG3Z5FwqgCfX1p8d4Cxr1BINI9HuiF2z4Z2a1CHnHmcux%3DcvImauiF2zfQl%2B4ZHm7ncqIr7VjGbuiF2zfCDkfCHZ4Zbnj9wWIBdvIpkY7R4TJr2uJREuHnEYgC8nHr7wHG3vjnDuiF2z4ZDr7ReTHF4wJFEUjtdvIpkXfpbr\"}]");
-user_pref("browser.topsites.contile.lastFetch", 1700805858);
+user_pref("browser.topsites.contile.cacheValidFor", 10481);
+user_pref("browser.topsites.contile.cachedTiles", "[{\"id\":74301,\"name\":\"Amazon\",\"url\":\"https://www.amazon.com/blackfriday/?tag=admarketus-20&ref=pd_sl_8f5f20968b5b5c79755458a9e8e24368eab1d8f94dbf1c4e0f7606de&mfadid=adm\",\"click_url\":\"https://bridge.sfo1.ap01.net/ctp?version=16.0.0&ci=1700821370621.12791&key=1700821370400900001.1&ctag=pd_sl_8f5f20968b5b5c79755458a9e8e24368eab1d8f94dbf1c4e0f7606de\",\"image_url\":\"https://contile-images.services.mozilla.com/obgoOYObjIFea_bXuT6L4LbBJ8j425AD87S1HMD3BWg.9991.jpg\",\"image_size\":200,\"impression_url\":\"https://imp.mt48.net/static?id=7RHzfOIXjFEYsBdvIpkX4ZbW1p8XfZxW4pbW1CbWfpbX7ReNxR3UIG8zInwYIFIVs9eYiGINHrwkiFXwxYIZjF8XgClWfC2X7R4dHQ8zJnErj%3DcO7R4dHQfz4Z2ZfplnHG3Z5FwqgCfX1p8d4Cxr1BINI9HuiF2z4Z2ZfplnHmcux%3DcvImauiF2zfQlWfp2%2B7ncqIr7VjGbuiF2zfCfk4Qxr4Qfnj9wWIBdvIpkY7R4TJr2uJREuHnEYgClnHr7wHG3vjnDuiF2zfCbY4BIWJ%3DcQIFdwJR2uiF2zfCbW4Wyy\"},{\"id\":8654,\"name\":\"Macy's\",\"url\":\"https://www.macys.com/?cm_mmc=Google_AdMarketPlace-_-Privacy_Tile-_-1700821370400900001_Broad-_-kclickid__kenshoo_clickid_&m_sc=sem&m_sb=Admarketplace&m_tp=Search&m_ac=Admarketplace&m_ag=Tile&m_cn=Privacy&m_pi=kclickid__kenshoo_clickid__1700821370400900001&mfadid=adm\",\"click_url\":\"https://bridge.sfo1.admarketplace.net/ctp?version=16.0.0&ci=1700821370621.12791&key=1700821370400900001.2&ctag=1700821370400900001\",\"image_url\":\"https://contile-images.services.mozilla.com/djXc7h7hwYtaoFDx8P6O1I1zCfl9xuCXPZO_VglGHB8.6181.jpg\",\"image_size\":200,\"impression_url\":\"https://imp.mt48.net/static?id=7RHzfOIXjFEYsBdvIpkX4ZbW1p8XfZxW4pbW1CbWfpbX7ReNxR3UIG8zInwYIFIVs9eYiGINHrwkiFXwxYIZjF8XgClWfC2X7R4dHQ8zJnErj%3DcO7R4dHQfz1pHd4tINj9fuiF2zfZlafQDd4Zx%2B7ncqjOdvIpka4QDk7n4NJGeNiFjU5FwqgC8X1pq%2BfOINI%3DjYJrEW5FwqgCldfQ2m1Cfa7R3%2Bx%3DDuiF2zfOIZJ%3Dzk5F%2BdJF7wxQkY7n4YIFckiGIw5FwqgClY4plnx%3DXNHmEuIF%2Bk5FwqgClWfpxy\"}]");
+user_pref("browser.topsites.contile.lastFetch", 1700822524);
 user_pref("browser.translations.enable", false);
 user_pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"customizableui-special-spring1\",\"urlbar-container\",\"customizableui-special-spring2\",\"save-to-pocket-button\",\"downloads-button\",\"fxa-toolbar-menu-button\",\"unified-extensions-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"firefox-view-button\",\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"import-button\",\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19,\"newElementCount\":2}");
 user_pref("browser.uitour.enabled", false);
@@ -169,7 +169,7 @@ user_pref("signon.rememberSignons", false);
 user_pref("startup.homepage_welcome_url", "about:blank");
 user_pref("toolkit.cosmeticAnimations.enabled", false);
 user_pref("toolkit.shutdown.fastShutdownStage", 3);
-user_pref("toolkit.startup.last_success", 1700805855);
+user_pref("toolkit.startup.last_success", 1700822522);
 user_pref("toolkit.startup.max_resumed_crashes", -1);
 user_pref("toolkit.telemetry.cachedClientID", "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0");
 user_pref("toolkit.telemetry.enabled", false);

diff --git a/out/sessionstore.jsonlz4 b/out/sessionstore.jsonlz4
diff --git a/out/xulstore.json b/out/xulstore.json
@@ -1 +1 @@
-{"chrome://browser/content/browser.xhtml":{"main-window":{"sizemode":"maximized"}}}
+{"chrome://browser/content/browser.xhtml":{"main-window":{"sizemode":"maximized"},"sidebar-box":{"sidebarcommand":"","style":""},"sidebar-title":{"value":""}}}