summaryrefslogtreecommitdiffstats
path: root/toolkit/components
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-25 22:46:40 +0200
committerGitHub <noreply@github.com>2018-05-25 22:46:40 +0200
commit8f354e52d09d1bf2fadfbbfc141d4f32241599a4 (patch)
treeca3fcaa2a72700b85221b2fe75bb7d46d5d424ce /toolkit/components
parentd5459982f0d1bab08b751dc140c4cbe047032617 (diff)
parent72bab89cf6c77c9ee95a977c306e6ce317b84835 (diff)
downloadUXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar
UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar.gz
UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar.lz
UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar.xz
UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.zip
Merge pull request #386 from MoonchildProductions/revert-381-masterPM28.0.0a2_Unstable
Revert "Remove the Social API"
Diffstat (limited to 'toolkit/components')
-rw-r--r--toolkit/components/telemetry/Histograms.json29
-rw-r--r--toolkit/components/telemetry/histogram-whitelists.json10
2 files changed, 39 insertions, 0 deletions
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 69a9ae44d..ade308cfa 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -6677,6 +6677,11 @@
"kind": "boolean",
"description": "If we are on Windows and neither the Windows countryCode nor the geoip countryCode indicates we are in the US, set to false if they both agree on the value or true otherwise"
},
+ "SOCIAL_ENABLED_ON_SESSION": {
+ "expires_in_version": "never",
+ "kind": "flag",
+ "description": "Social has been enabled at least once on the current session"
+ },
"ENABLE_PRIVILEGE_EVER_CALLED": {
"expires_in_version": "never",
"kind": "flag",
@@ -8963,6 +8968,30 @@
"description": "Scaling percentage for the display where the first window is opened (Linux only)",
"cpp_guard": "XP_LINUX"
},
+ "SOCIAL_SIDEBAR_STATE": {
+ "expires_in_version": "never",
+ "kind": "boolean",
+ "description": "Social Sidebar state 0: closed, 1: opened. Toggling between providers will result in a higher opened rate."
+ },
+ "SOCIAL_TOOLBAR_BUTTONS": {
+ "expires_in_version": "never",
+ "kind": "enumerated",
+ "n_values": 3,
+ "description": "Social toolbar button has been used (0:share, 1:status, 2:bookmark)"
+ },
+ "SOCIAL_PANEL_CLICKS": {
+ "expires_in_version": "never",
+ "kind": "enumerated",
+ "n_values": 4,
+ "description": "Social content has been interacted with (0:share, 1:status, 2:bookmark, 3: sidebar)"
+ },
+ "SOCIAL_SIDEBAR_OPEN_DURATION": {
+ "expires_in_version": "never",
+ "kind": "exponential",
+ "high": 10000000,
+ "n_buckets": 10,
+ "description": "Sidebar showing: seconds that the sidebar has been opened"
+ },
"SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION": {
"expires_in_version": "never",
"kind": "exponential",
diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
index deb1bd5b3..486178199 100644
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -610,6 +610,11 @@
"SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
"SLOW_ADDON_WARNING_RESPONSE_TIME",
"SLOW_ADDON_WARNING_STATES",
+ "SOCIAL_ENABLED_ON_SESSION",
+ "SOCIAL_PANEL_CLICKS",
+ "SOCIAL_SIDEBAR_OPEN_DURATION",
+ "SOCIAL_SIDEBAR_STATE",
+ "SOCIAL_TOOLBAR_BUTTONS",
"SPDY_CHUNK_RECVD",
"SPDY_GOAWAY_LOCAL",
"SPDY_GOAWAY_PEER",
@@ -1496,6 +1501,11 @@
"SLOW_ADDON_WARNING_RESPONSE_TIME",
"SLOW_ADDON_WARNING_STATES",
"SLOW_SCRIPT_NOTICE_COUNT",
+ "SOCIAL_ENABLED_ON_SESSION",
+ "SOCIAL_PANEL_CLICKS",
+ "SOCIAL_SIDEBAR_OPEN_DURATION",
+ "SOCIAL_SIDEBAR_STATE",
+ "SOCIAL_TOOLBAR_BUTTONS",
"SPDY_CHUNK_RECVD",
"SPDY_GOAWAY_LOCAL",
"SPDY_GOAWAY_PEER",