Noissue - Merge current tip to Edge bookmark

lib/prefs.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 95 matching lines @@
  * @type {string}
  */
 defaults.notificationurl = "https://notification.adblockplus.org/notification.json";
 /**
  * The total number of requests blocked by the extension.
  *
  * @type {number}
  */
 defaults.blocked_total = 0;
 /**
- * Whether to show a badge in the toolbar icon indicating the number of blocked ads.
+ * Whether to show a badge in the toolbar icon indicating the number
+ * of blocked ads.
  *
  * @type {boolean}
  */
 defaults.show_statsinicon = true;
 /**
  * Whether to show the number of blocked ads in the popup.
  *
  * @type {boolean}
  */
 defaults.show_statsinpopup = true;
@@ skipping 123 matching lines @@
     },
     enumerable: true
   });
 }
 
 function init()
 {
   let prefs = Object.keys(defaults);
   prefs.forEach(addPreference);
 
-  let localLoaded = new Promise(resolve => {
+  let localLoaded = new Promise(resolve =>
+  {
     ext.storage.get(prefs.map(prefToKey), items =>
     {
       for (let key in items)
         overrides[keyToPref(key)] = items[key];
 
       resolve();
     });
   });
 
-  let managedLoaded = new Promise(resolve => {
-    if (typeof chrome == "object" && "managed" in chrome.storage)
+  let managedLoaded = new Promise(resolve =>
+  {
+    if (require("info").platform == "chromium" && "managed" in chrome.storage)
     {
       chrome.storage.managed.get(null, items =>
       {
         // Opera doesn't support chrome.storage.managed, but instead simply
         // removing the API, Opera sets chrome.runtime.lastError when using it.
         // So we have to retrieve that error, to prevent it from showing up
         // in the console.
         chrome.runtime.lastError;
 
         for (let key in items)
@@ skipping 26 matching lines @@
           eventEmitter.emit(pref);
         }
       }
     });
   }
 
   Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
 }
 
 init();