From 6b8113f1cd9ff8c8bc3ffcdb3069654b4125819f Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Sat, 21 May 2016 17:58:06 +0200
Subject: [PATCH] :arrow_up: cookies.

---
 cookies/main.js      |  8 ++++----
 cookies/manager.js   | 28 +++++++++++++---------------
 cookies/package.json |  2 +-
 cookies/readme.md    |  7 ++++---
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/cookies/main.js b/cookies/main.js
index 305931b..ac4ae1b 100644
--- a/cookies/main.js
+++ b/cookies/main.js
@@ -1,9 +1,9 @@
-var app = require('app');
-var BrowserWindow = require('browser-window');
+const {app, BrowserWindow} = require('electron');
+
+let mainWindow;
 
-var mainWindow = null;
 app.on('ready', function() {
   mainWindow = new BrowserWindow({width: 400, height: 360});
-  mainWindow.loadUrl('file://' + __dirname + '/manager.html');
+  mainWindow.loadURL('file://' + __dirname + '/manager.html');
 });
 
diff --git a/cookies/manager.js b/cookies/manager.js
index dbb9a3e..4790b71 100644
--- a/cookies/manager.js
+++ b/cookies/manager.js
@@ -1,4 +1,4 @@
-var win = require('remote').getCurrentWindow();
+const ses = require('electron').remote.getCurrentWebContents().session;
 
 // A simple Timer class.
 function Timer() {
@@ -108,16 +108,15 @@ function removeAll() {
     });
   });
   cache.reset();
-  var count = all_cookies.length;
   var timer = new Timer();
-  for (var i = 0; i < count; i++) {
-    removeCookie(all_cookies[i]);
+  for (let cookie of all_cookies) {
+    removeCookie(cookie);
   }
   timer.reset();
-  win.webContents.session.cookies.get({}, function(cookies) {
-    for (var i in cookies) {
-      cache.add(cookies[i]);
-      removeCookie(cookies[i]);
+  ses.cookies.get({}, function(cookies) {
+    for (let cookie in cookies) {
+      cache.add(cookie);
+      removeCookie(cookie);
     }
   });
 }
@@ -125,10 +124,9 @@ function removeAll() {
 function removeCookie(cookie) {
   var url = "http" + (cookie.secure ? "s" : "") + "://" + cookie.domain +
             cookie.path;
-  win.webContents.session.cookies.remove({"url": url, "name": cookie.name},
-      function(error) {
-        if (error) throw error;
-        update(cookie);
+  ses.cookies.remove(url, cookie.name, function(error) {
+      if (error) throw error;
+      update(cookie);
   });
 }
 
@@ -225,12 +223,12 @@ function update(cookie) {
 function onload() {
   focusFilter();
   var timer = new Timer();
-  win.webContents.session.cookies.get({}, function(error, cookies) {
+  ses.cookies.get({}, function(error, cookies) {
     if (error) throw error;
     console.log(cookies);
     start = new Date();
-    for (var i in cookies) {
-      cache.add(cookies[i]);
+    for (let cookie of cookies) {
+      cache.add(cookie);
     }
     timer.reset();
     reloadCookieTable();
diff --git a/cookies/package.json b/cookies/package.json
index 6b94498..2b0fe46 100644
--- a/cookies/package.json
+++ b/cookies/package.json
@@ -1,5 +1,5 @@
 {
   "name"    : "cookies-demo",
-  "version" : "0.1.0",
+  "version" : "1.1.0",
   "main"    : "main.js"
 }
diff --git a/cookies/readme.md b/cookies/readme.md
index 6583762..b62cdde 100644
--- a/cookies/readme.md
+++ b/cookies/readme.md
@@ -1,12 +1,13 @@
 # Cookies
 
-A sample app allows you to manipulate your cookies data using [cookies](
-https://github.com/atom/electron/blob/master/docs/api/browser-window.md#sessioncookies) API.
+A sample app allows you to manipulate your cookies data using [cookies][1] API.
 
 ## APIs
 
-[Session.cookies](https://github.com/atom/electron/blob/master/docs/api/browser-window.md#sessioncookies)
+[Session.cookies][1]
 
 ## Screenshot
 
 ![screenshot](/cookies/screenshot/screenshot.png)
+
+[1]: https://github.com/electron/electron/blob/master/docs/api/session.md#sescookies