Unified Diff: lib/prefs.js
Issue 29570614:
Issue 5028 - Use browser namespace (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Rebase
Created Oct. 13, 2017, 7:59 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/notificationHelper.js ('K')
|
« lib/popupBlocker.js ('k')
|
lib/requestBlocker.js » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/prefs.js |
| =================================================================== |
| --- a/lib/prefs.js |
| +++ b/lib/prefs.js |
| @@ -319,25 +319,25 @@ |
| overrides[keyToPref(key)] = items[key]; |
| resolve(); |
| }); |
| }); |
| let managedLoaded = new Promise(resolve => |
| { |
| - if (require("info").platform == "chromium" && "managed" in chrome.storage) |
| + if (require("info").platform == "chromium" && "managed" in browser.storage) |
| { |
| - chrome.storage.managed.get(null, items => |
| + browser.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. |
| + // Opera doesn't support browser.storage.managed, but instead simply |
| + // removing the API, Opera sets browser.runtime.lastError when using it. |
| // So we have to retrieve that error, to prevent it from showing up |
| // in the console. |
| - chrome.runtime.lastError; |
| + browser.runtime.lastError; |
| for (let key in items) |
| defaults[key] = items[key]; |
| resolve(); |
| }); |
| } |
| else |
« lib/notificationHelper.js ('K')
|
« lib/popupBlocker.js ('k')
|
lib/requestBlocker.js » ('j')
|
no next file with comments »
