author | Benjamin Smedberg <benjamin@smedbergs.us> |
Wed, 16 Oct 2013 16:35:40 -0400 | |
changeset 165046 | ed19724fff799b65837ccde803bb5b0fd957212b |
parent 165045 | ac90f9d869c943d94b0e15e6fbaf06e6e0261a84 |
child 165047 | 600d74aea793feef28c79cd01a532783e34c3b74 |
push id | 3066 |
push user | akeybl@mozilla.com |
push date | Mon, 09 Dec 2013 19:58:46 +0000 |
treeherder | mozilla-beta@a31a0dce83aa [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jaws |
bugs | 927174 |
milestone | 27.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
browser/app/profile/firefox.js | file | annotate | diff | comparison | revisions | |
browser/base/content/browser-plugins.js | file | annotate | diff | comparison | revisions |
--- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -660,16 +660,18 @@ pref("pfs.datasource.url", "https://pfs. pref("plugins.hide_infobar_for_blocked_plugin", false); pref("plugins.hide_infobar_for_outdated_plugin", false); pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); pref("plugins.update.notifyUser", false); pref("plugins.click_to_play", true); +pref("plugins.clickToActivateInfo.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/clicktoplay"); + // let all plugins except Flash default to click-to-play pref("plugin.default.state", 1); pref("plugin.state.flash", 2); // display door hanger if flash not installed pref("plugins.notifyMissingFlash", true); #ifdef XP_WIN
--- a/browser/base/content/browser-plugins.js +++ b/browser/base/content/browser-plugins.js @@ -699,16 +699,19 @@ var gPluginHandler = { let url; // TODO: allow the blocklist to specify a better link, bug 873093 if (pluginInfo.blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE) { url = Services.urlFormatter.formatURLPref("plugins.update.url"); } else if (pluginInfo.blocklistState != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) { url = Services.blocklist.getPluginBlocklistURL(pluginInfo.pluginTag); } + else { + url = Services.urlFormatter.formatURLPref("plugins.clickToActivateInfo.url"); + } pluginInfo.detailsLink = url; centerActions.push(pluginInfo); } centerActions.sort(function(a, b) { return a.pluginName.localeCompare(b.pluginName); });