Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: chrome/ext/background.js

Issue 5693109165883392: Issue 2040 - Replaced localStorage with chrome.storage.local (Closed)
Patch Set: Addressed comment Created March 16, 2015, 12:53 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « background.js ('k') | lib/prefs.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 }); 492 });
493 493
494 // We have to ensure there is at least one listener for the onConnect event. 494 // We have to ensure there is at least one listener for the onConnect event.
495 // Otherwise we can't connect a port later, which we need to do in order to 495 // Otherwise we can't connect a port later, which we need to do in order to
496 // detect when the extension is reloaded, disabled or uninstalled. 496 // detect when the extension is reloaded, disabled or uninstalled.
497 chrome.runtime.onConnect.addListener(function() {}); 497 chrome.runtime.onConnect.addListener(function() {});
498 498
499 499
500 /* Storage */ 500 /* Storage */
501 501
502 ext.storage = localStorage; 502 ext.storage = {
503 get: function(keys, callback)
504 {
505 chrome.storage.local.get(keys, callback);
506 },
507 set: function(key, value, callback)
508 {
509 let items = {};
510 items[key] = value;
511 chrome.storage.local.set(items, callback);
512 },
513 remove: function(key, callback)
514 {
515 chrome.storage.local.remove(key, callback);
516 },
517 onChanged: chrome.storage.onChanged,
503 518
519 // Migrate localStorage to chrome.storage.local,
520 // ignoring unkown and inavlid preferences.
521 migratePrefs: function(mapFunc)
522 {
523 var items = {};
524
525 for (let key in localStorage)
526 {
527 var item = mapFunc(key, localStorage[key]);
528 if (item)
529 items[item.key] = item.value;
530 }
531
532 chrome.storage.local.set(items, function() {
533 localStorage.clear();
534 });
535 }
536 };
504 537
505 /* Options */ 538 /* Options */
506 539
507 ext.showOptions = function(callback) 540 ext.showOptions = function(callback)
508 { 541 {
509 chrome.windows.getLastFocused(function(win) 542 chrome.windows.getLastFocused(function(win)
510 { 543 {
511 var optionsUrl = chrome.extension.getURL("options.html"); 544 var optionsUrl = chrome.extension.getURL("options.html");
512 var queryInfo = {url: optionsUrl}; 545 var queryInfo = {url: optionsUrl};
513 546
(...skipping 16 matching lines...) Expand all
530 callback(new Page(tab)); 563 callback(new Page(tab));
531 } 564 }
532 else 565 else
533 { 566 {
534 ext.pages.open(optionsUrl, callback); 567 ext.pages.open(optionsUrl, callback);
535 } 568 }
536 }); 569 });
537 }); 570 });
538 }; 571 };
539 })(); 572 })();
OLDNEW
« no previous file with comments | « background.js ('k') | lib/prefs.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld