--- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -189,8 +189,8 @@ pref("browser.uitour.readerViewTrigger", "^https:\\/\\/www\\.mozilla\\.org\\/[^\ // How long to show a Hearbeat survey (two hours, in seconds) pref("browser.uitour.surveyDuration", 7200); -pref("browser.customizemode.tip0.shown", false); -pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); +pref("browser.customizemode.tip0.shown", true); +pref("browser.customizemode.tip0.learnMoreUrl", ""); pref("keyword.enabled", true); pref("browser.fixup.domainwhitelist.localhost", true); @@ -206,7 +206,7 @@ pref("general.autoScroll", true); #endif // At startup, check if we're the default browser and prompt user if not. -pref("browser.shell.checkDefaultBrowser", true); +pref("browser.shell.checkDefaultBrowser", false); pref("browser.shell.shortcutFavicons",true); pref("browser.shell.mostRecentDateSetAsDefault", ""); #ifdef RELEASE_OR_BETA @@ -220,7 +220,7 @@ pref("browser.defaultbrowser.notificationbar", false); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore -pref("browser.startup.page", 1); +pref("browser.startup.page", 0); pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); // Whether we should skip the homepage when opening the first-run page pref("browser.startup.firstrunSkipsHomepage", false); @@ -294,7 +294,7 @@ pref("browser.urlbar.suggest.history", true); pref("browser.urlbar.suggest.bookmark", true); pref("browser.urlbar.suggest.openpage", true); pref("browser.urlbar.suggest.searches", false); -pref("browser.urlbar.userMadeSearchSuggestionsChoice", false); +pref("browser.urlbar.userMadeSearchSuggestionsChoice", true); // 4 here means the suggestion notification will be automatically // hidden the 4th day, so it will actually be shown on 3 different days. pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4); @@ -344,7 +344,7 @@ pref("browser.download.showPanelDropmarker", true); pref("browser.download.animateNotifications", true); // This records whether or not the panel has been shown at least once. -pref("browser.download.panel.shown", false); +pref("browser.download.panel.shown", true); #ifndef XP_MACOSX pref("browser.helperApps.deleteTempFileOnExit", true); @@ -388,7 +388,7 @@ pref("browser.search.reset.enabled", true); pref("browser.sessionhistory.max_entries", 50); // Built-in default permissions. -pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions"); +pref("permissions.manager.defaultsUrl", ""); // handle links targeting new windows // 1=current window/tab, 2=new window, 3=new tab in most recent window @@ -418,7 +418,7 @@ pref("browser.link.open_newwindow.disabled_in_fullscreen", false); // Tabbed browser pref("browser.tabs.closeWindowWithLastTab", true); pref("browser.tabs.insertRelatedAfterCurrent", true); -pref("browser.tabs.warnOnClose", true); +pref("browser.tabs.warnOnClose", false); pref("browser.tabs.warnOnCloseOtherTabs", true); pref("browser.tabs.warnOnOpen", true); pref("browser.tabs.maxOpenBeforeWarn", 15); @@ -595,7 +595,7 @@ pref("browser.xul.error_pages.enabled", true); pref("browser.xul.error_pages.expert_bad_cert", false); // Enable captive portal detection. -pref("network.captive-portal-service.enabled", true); +pref("network.captive-portal-service.enabled", false); // If true, network link events will change the value of navigator.onLine pref("network.manage-offline-status", true); @@ -773,7 +773,7 @@ pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/fi pref("browser.EULA.version", 3); pref("browser.rights.version", 3); -pref("browser.rights.3.shown", false); +pref("browser.rights.3.shown", true); #ifdef DEBUG // Don't show the about:rights notification in debug builds. @@ -1149,18 +1149,18 @@ pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.prop pref("prompts.tab_modal.enabled", true); // Activates preloading of the new tab url. -pref("browser.newtab.preload", true); +pref("browser.newtab.preload", false); // Remembers if the about:newtab intro has been shown // NOTE: This preference is unused but was not removed in case // this information will be valuable in the future. -pref("browser.newtabpage.introShown", false); +pref("browser.newtabpage.introShown", true); // Toggles the content of 'about:newtab'. Shows the grid when enabled. -pref("browser.newtabpage.enabled", true); +pref("browser.newtabpage.enabled", false); // Toggles the enhanced content of 'about:newtab'. Shows sponsored tiles. -sticky_pref("browser.newtabpage.enhanced", true); +sticky_pref("browser.newtabpage.enhanced", false); // enables Activity Stream inspired layout pref("browser.newtabpage.compact", false); @@ -1175,10 +1175,10 @@ pref("browser.newtabpage.rows", 3); pref("browser.newtabpage.columns", 5); // directory tiles download URL -pref("browser.newtabpage.directory.source", "https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%"); +pref("browser.newtabpage.directory.source", ""); // endpoint to send newtab click and view pings -pref("browser.newtabpage.directory.ping", "https://tiles.services.mozilla.com/v3/links/"); +pref("browser.newtabpage.directory.ping", ""); // activates the remote-hosted newtab page pref("browser.newtabpage.remote", false); @@ -1206,10 +1206,10 @@ pref("toolkit.startup.max_resumed_crashes", 3); // Completely disable pdf.js as an option to preview pdfs within firefox. // Note: if this is not disabled it does not necessarily mean pdf.js is the pdf // handler just that it is an option. -pref("pdfjs.disabled", false); +pref("pdfjs.disabled", true); // Used by pdf.js to know the first time firefox is run with it installed so it // can become the default pdf viewer. -pref("pdfjs.firstRun", true); +pref("pdfjs.firstRun", false); // The values of preferredAction and alwaysAskBeforeHandling before pdf.js // became the default. pref("pdfjs.previousHandler.preferredAction", 0); @@ -1247,38 +1247,11 @@ pref("plain_text.wrap_long_lines", true); // before content. pref("dom.debug.propagate_gesture_events_through_content", false); -// The request URL of the GeoLocation backend. -#ifdef RELEASE_OR_BETA -pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%"); -#else -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -#endif - -#ifdef XP_MACOSX -#ifdef RELEASE_OR_BETA +pref("geo.wifi.uri", ""); pref("geo.provider.use_corelocation", false); -#else -pref("geo.provider.use_corelocation", true); -#endif -#endif - -#ifdef XP_WIN pref("geo.provider.ms-windows-location", false); -#endif - -#ifdef MOZ_WIDGET_GTK -#ifdef MOZ_GPSD -#ifdef RELEASE_OR_BETA pref("geo.provider.use_gpsd", false); -#else -pref("geo.provider.use_gpsd", true); -#endif -#endif -#endif - -// Necko IPC security checks only needed for app isolation for cookies/cache/etc: -// currently irrelevant for desktop e10s -pref("network.disable.ipc.security", true); +pref("network.disable.ipc.security", false); // CustomizableUI debug logging. pref("browser.uiCustomization.debug", false); @@ -1322,8 +1295,8 @@ pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sy // URLs for promo links to mobile browsers. Note that consumers are expected to // append a value for utm_campaign. -pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign="); -pref("identity.mobilepromo.ios", "https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign="); +pref("identity.mobilepromo.android", ""); +pref("identity.mobilepromo.ios", ""); // Migrate any existing Firefox Account data from the default profile to the // Developer Edition profile. @@ -1339,7 +1312,6 @@ pref("ui.key.menuAccessKeyFocuses", true); #endif // Encrypted media extensions. -#ifdef XP_LINUX // On Linux EME is visible but disabled by default. This is so that the // "Play DRM content" checkbox in the Firefox UI is unchecked by default. // DRM requires downloading and installing proprietary binaries, which @@ -1348,10 +1320,7 @@ pref("ui.key.menuAccessKeyFocuses", true); // enable DRM, whereupon the EME plugin binaries will be downloaded if // permission is granted. pref("media.eme.enabled", false); -#else -pref("media.eme.enabled", true); -#endif -pref("media.eme.apiVisible", true); +pref("media.eme.apiVisible", false); // Decode using Gecko Media Plugins in