Bug 1353571 part 1 - Remove pref identity.fxaccounts.profile_image.enabled. r=markh

MozReview-Commit-ID: 4iy2S1kYUEh

--HG--
extra : rebase_source : 03a166960e03e76bcbf0c2be6ff4e4e38dd692e6

browser/app/profile/firefox.js

@@ -1384,9 +1384,6 @@ pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox
 // The remote URL of the FxA OAuth Server
 pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com/v1");
 
-// Whether we display profile images in the UI or not.
-pref("identity.fxaccounts.profile_image.enabled", true);
-
 // Token server used by the FxA Sync identity.
 pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5");
 

browser/base/content/browser-fxaccounts.js

@@ -154,8 +154,6 @@ var gFxAccounts = {
 
   // Note that updateUI() returns a Promise that's only used by tests.
   updateUI() {
-    let profileInfoEnabled = Services.prefs.getBoolPref("identity.fxaccounts.profile_image.enabled", false);
-
     this.panelUIFooter.hidden = false;
 
     // Make sure the button is disabled in customization mode.
@@ -187,7 +185,6 @@ var gFxAccounts = {
       this.panelUILabel.setAttribute("label", defaultLabel);
       this.panelUIStatus.setAttribute("tooltiptext", defaultTooltiptext);
       this.panelUIFooter.removeAttribute("fxastatus");
-      this.panelUIFooter.removeAttribute("fxaprofileimage");
       this.panelUIAvatar.style.removeProperty("list-style-image");
       let showErrorBadge = false;
       if (userData) {
@@ -209,9 +206,6 @@ var gFxAccounts = {
           this.panelUIFooter.setAttribute("fxastatus", "signedin");
           this.panelUILabel.setAttribute("label", userData.email);
         }
-        if (profileInfoEnabled) {
-          this.panelUIFooter.setAttribute("fxaprofileimage", "enabled");
-        }
       }
       if (showErrorBadge) {
         PanelUI.showBadgeOnlyNotification("fxa-needs-authentication");
@@ -221,26 +215,22 @@ var gFxAccounts = {
     }
 
     let updateWithProfile = (profile) => {
-      if (profileInfoEnabled) {
-        if (profile.displayName) {
-          this.panelUILabel.setAttribute("label", profile.displayName);
-        }
-        if (profile.avatar) {
-          this.panelUIFooter.setAttribute("fxaprofileimage", "set");
-          let bgImage = "url(\"" + profile.avatar + "\")";
-          this.panelUIAvatar.style.listStyleImage = bgImage;
+      if (profile.displayName) {
+        this.panelUILabel.setAttribute("label", profile.displayName);
+      }
+      if (profile.avatar) {
+        let bgImage = "url(\"" + profile.avatar + "\")";
+        this.panelUIAvatar.style.listStyleImage = bgImage;
 
-          let img = new Image();
-          img.onerror = () => {
-            // Clear the image if it has trouble loading. Since this callback is asynchronous
-            // we check to make sure the image is still the same before we clear it.
-            if (this.panelUIAvatar.style.listStyleImage === bgImage) {
-              this.panelUIFooter.removeAttribute("fxaprofileimage");
-              this.panelUIAvatar.style.removeProperty("list-style-image");
-            }
-          };
-          img.src = profile.avatar;
-        }
+        let img = new Image();
+        img.onerror = () => {
+          // Clear the image if it has trouble loading. Since this callback is asynchronous
+          // we check to make sure the image is still the same before we clear it.
+          if (this.panelUIAvatar.style.listStyleImage === bgImage) {
+            this.panelUIAvatar.style.removeProperty("list-style-image");
+          }
+        };
+        img.src = profile.avatar;
       }
     }
 
@@ -249,7 +239,7 @@ var gFxAccounts = {
       updateWithUserData(userData);
       // unverified users cause us to spew log errors fetching an OAuth token
       // to fetch the profile, so don't even try in that case.
-      if (!userData || !userData.verified || !profileInfoEnabled) {
+      if (!userData || !userData.verified) {
         return null; // don't even try to grab the profile.
       }
       if (this._cachedProfile) {

browser/components/preferences/in-content-old/sync.js

@@ -129,8 +129,6 @@ var gSyncPane = {
     });
 
     this.updateWeavePrefs();
-
-    this._initProfileImageUI();
   },
 
   _toggleComputerNameControls(editMode) {
@@ -225,14 +223,6 @@ var gSyncPane = {
     });
   },
 
-  _initProfileImageUI() {
-    try {
-      if (Services.prefs.getBoolPref("identity.fxaccounts.profile_image.enabled")) {
-        document.getElementById("fxaProfileImage").hidden = false;
-      }
-    } catch (e) { }
-  },
-
   updateWeavePrefs() {
     let service = Components.classes["@mozilla.org/weave/service;1"]
                   .getService(Components.interfaces.nsISupports)
@@ -243,8 +233,6 @@ var gSyncPane = {
     fxaEmailAddress1Label.hidden = false;
     displayNameLabel.hidden = true;
 
-    let profileInfoEnabled = Services.prefs.getBoolPref("identity.fxaccounts.profile_image.enabled", false);
-
     // determine the fxa status...
     this._showLoadPage(service);
 
@@ -300,7 +288,7 @@ var gSyncPane = {
       return null;
     }).then(data => {
       let fxaLoginStatus = document.getElementById("fxaLoginStatus");
-      if (data && profileInfoEnabled) {
+      if (data) {
         if (data.displayName) {
           fxaLoginStatus.setAttribute("hasName", true);
           displayNameLabel.hidden = false;

browser/components/preferences/in-content-old/sync.xul

@@ -88,7 +88,7 @@
               <vbox align="center" pack="center">
                 <image id="fxaProfileImage" class="actionable"
                     role="button"
-                    onclick="gSyncPane.openChangeProfileImage(event);" hidden="true"
+                    onclick="gSyncPane.openChangeProfileImage(event);"
                     onkeypress="gSyncPane.openChangeProfileImage(event);"
                     tooltiptext="&profilePicture.tooltip;"/>
               </vbox>

browser/components/preferences/in-content/sync.js

@@ -129,8 +129,6 @@ var gSyncPane = {
     });
 
     this.updateWeavePrefs();
-
-    this._initProfileImageUI();
   },
 
   _toggleComputerNameControls(editMode) {
@@ -225,14 +223,6 @@ var gSyncPane = {
     });
   },
 
-  _initProfileImageUI() {
-    try {
-      if (Services.prefs.getBoolPref("identity.fxaccounts.profile_image.enabled")) {
-        document.getElementById("fxaProfileImage").hidden = false;
-      }
-    } catch (e) { }
-  },
-
   updateWeavePrefs() {
     let service = Components.classes["@mozilla.org/weave/service;1"]
                   .getService(Components.interfaces.nsISupports)
@@ -243,8 +233,6 @@ var gSyncPane = {
     fxaEmailAddress1Label.hidden = false;
     displayNameLabel.hidden = true;
 
-    let profileInfoEnabled = Services.prefs.getBoolPref("identity.fxaccounts.profile_image.enabled", false);
-
     // determine the fxa status...
     this._showLoadPage(service);
 
@@ -300,7 +288,7 @@ var gSyncPane = {
       return null;
     }).then(data => {
       let fxaLoginStatus = document.getElementById("fxaLoginStatus");
-      if (data && profileInfoEnabled) {
+      if (data) {
         if (data.displayName) {
           fxaLoginStatus.setAttribute("hasName", true);
           displayNameLabel.hidden = false;

browser/components/preferences/in-content/sync.xul

@@ -87,7 +87,7 @@
               <vbox align="center" pack="center">
                 <image id="fxaProfileImage" class="actionable"
                     role="button"
-                    onclick="gSyncPane.openChangeProfileImage(event);" hidden="true"
+                    onclick="gSyncPane.openChangeProfileImage(event);"
                     onkeypress="gSyncPane.openChangeProfileImage(event);"
                     tooltiptext="&profilePicture.tooltip;"/>
               </vbox>

browser/themes/shared/customizableui/panelUI.inc.css

@@ -571,8 +571,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 }
 
 #PanelUI-footer-fxa:not([fxastatus="signedin"]) > toolbarseparator,
-#PanelUI-footer-fxa:not([fxastatus="signedin"]) > #PanelUI-fxa-icon,
-#PanelUI-footer-fxa:not([fxaprofileimage]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
+#PanelUI-footer-fxa:not([fxastatus="signedin"]) > #PanelUI-fxa-icon {
   display: none;
 }
 
@@ -725,8 +724,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   border-inline-start-style: none;
 }
 
-#PanelUI-footer-fxa[fxaprofileimage="set"] > #PanelUI-fxa-status > #PanelUI-fxa-label,
-#PanelUI-footer-fxa[fxaprofileimage="enabled"]:not([fxastatus="error"]) > #PanelUI-fxa-status > #PanelUI-fxa-label {
+#PanelUI-footer-fxa[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label {
   padding-inline-start: 0px;
 }
 
@@ -887,11 +885,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 }
 
 #PanelUI-footer-fxa[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon,
-#PanelUI-footer-fxa[fxastatus="error"][fxaprofileimage="set"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon {
-  display: none;
-}
-
-#PanelUI-footer-fxa[fxastatus="error"]:not([fxaprofileimage="set"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
+#PanelUI-footer-fxa:not([fxastatus="signedin"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
   display: none;
 }
 
@@ -914,7 +908,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   margin-inline-end: 0;
 }
 
-#PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
+#PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
   list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg);
 }