Merge branch 'master' into dev-sync-explicit

# Conflicts:
#	background/sync-manager.js

background/icon-manager.js

@@ -67,13 +67,15 @@ const iconMan = (() => {
       refreshIconBadgeColor();
       setBadgeText({text});
       for (const tabId of tabMan.list()) {
-        if (badgeOvr) {
+        if (text) {
           setBadgeText({tabId, text});
         } else {
           refreshIconBadgeText(tabId);
         }
       }
-      chrome.browserAction.setTitle({title});
+      chrome.browserAction.setTitle({
+        title: title && chrome.i18n.getMessage(title) || title || '',
+      });
     },
   };
 

background/sync-manager.js

@@ -204,24 +204,7 @@ const syncMan = (() => {
 
   function emitStatusChange() {
     msg.broadcastExtension({method: 'syncStatusUpdate', status});
-
+    iconMan.overrideBadge(getErrorBadge());
-    if (status.state !== STATES.connected) {
-      iconMan.overrideBadge({});
-    } else if (!status.login) {
-      iconMan.overrideBadge({
-        text: 'x',
-        color: '#F00',
-        title: chrome.i18n.getMessage('syncErrorRelogin'),
-      });
-    } else if (lastError && !isNetworkError(lastError)) {
-      iconMan.overrideBadge({
-        text: 'x',
-        color: '#F00',
-        title: chrome.i18n.getMessage('syncError'),
-      });
-    } else {
-      iconMan.overrideBadge({});
-    }
   }
 
   function isNetworkError(err) {
@@ -234,6 +217,17 @@ const syncMan = (() => {
     return false;
   }
 
+  function getErrorBadge() {
+    if (status.state === STATES.connected &&
+        (!status.login || lastError && !isNetworkError(lastError))) {
+      return {
+        text: 'x',
+        color: '#F00',
+        title: !status.login ? 'syncErrorRelogin' : 'syncError',
+      };
+    }
+  }
+
   function getDrive(name) {
     if (name === 'dropbox' || name === 'google' || name === 'onedrive') {
       return dbToCloud.drive[name]({