Bug 1537648 - remove change avatar button from FxA menu r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D24527

--HG--
extra : moz-landing-system : lando

browser/base/content/browser-sync.js

@@ -478,11 +478,6 @@ var gSync = {
     switchToTabHavingURI(url, true, { replaceQueryString: true });
   },
 
-  async openFxAChangeAvatar(entryPoint) {
-    const url = await FxAccounts.config.promiseChangeAvatarURI(entryPoint);
-    switchToTabHavingURI(url, true, { replaceQueryString: true });
-  },
-
   async openFxAEmailFirstPage(entryPoint) {
     const url = await FxAccounts.config.promiseEmailFirstURI(entryPoint);
     switchToTabHavingURI(url, true, { replaceQueryString: true });

browser/components/customizableui/content/panelUI.inc.xul

@@ -737,10 +737,8 @@
           <toolbarbutton class="PanelUI-fxa-signin-button" label="&fxa.unverified.button.label;" oncommand="gSync.openPrefs('fxa_discoverability_native');"/>
         </vbox>
         <vbox id="PanelUI-fxa-menu">
-          <hbox flex="1" pack="center" class="fxa-avatar-subpanel">
-            <toolbarbutton align="left" oncommand="gSync.openFxAChangeAvatar('fxa_discoverability_native');">
-              <image id="fxa-menu-avatar"/>
-            </toolbarbutton>
+          <hbox flex="1" align="center" class="fxa-avatar-subpanel">
+            <image role="presentation" id="fxa-menu-avatar"/>
             <vbox flex="1">
               <label class="fxa-avatar-subpanel-description" >&fxa.menu.signedInAs.label;</label>
               <label id="fxa-menu-email"></label>

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

@@ -674,7 +674,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 
 /* Firefox Account Toolbar Panel */
 
-#fxa-menu-avatar,
 #fxa-avatar-image {
   width: 16px;
   height: 16px;
@@ -748,8 +747,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 #fxa-menu-avatar {
   height: 32px;
   width: 32px;
-  pointer-events: none;
   margin-inline-start: 20px;
+  margin-inline-end: 5px;
   -moz-context-properties: fill, fill-opacity;
   fill: var(--arrowpanel-color);
 }