From 5e73b0372df30f13e993c33dbd71d04cf8699ee0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 4 May 2016 17:38:03 +0900
Subject: [PATCH 001/510] Make the drag box fill the remaining height of window

---
 default_app/index.html | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/default_app/index.html b/default_app/index.html
index c10d67a089ac..a6126e5de6c7 100644
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -10,10 +10,15 @@
       font-variant: normal;
       padding: 0;
       margin: 0;
+      display: flex;
+      flex-direction: column;
     }
 
     .container {
-      padding: 15px 30px;
+      margin: 15px 30px 30px 30px;
+      flex: 1;
+      display: flex;
+      flex-direction: column;
     }
 
     .header {
@@ -90,11 +95,9 @@
 
     #holder {
       display: flex;
+      flex: 1;
       align-items: center;
       justify-content: center;
-      margin: 0 auto;
-      padding: 10px;
-      height: 275px;
       border: 1px solid #e0e5e6;
       background-color: #f6f8f8;
       color: #466a72;
@@ -132,7 +135,7 @@
     };
   </script>
 
-  <header class="header">
+  <div class="header">
     <svg class="header-icon" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
       <g stroke="none" fill="none" fill-rule="evenodd">
         <path class="svg-stroke" d="M11.7014354,7.72646259 C7.91761319,7.04380371 4.81334929,7.69369948 3.61536899,9.74908711 C2.72656361,11.27402 3.03878853,13.3122813 4.27551338,15.4489979 M6.32642733,18.1886712 C7.89193828,19.8928217 9.9666792,21.548102 12.4120986,22.9466461 C18.2414315,26.2804624 24.2930499,27.0779063 27.1669222,25.1368228 M29.8456419,24.0565148 C29.8456419,23.1971812 29.1423799,22.5005537 28.2748621,22.5005537 C27.4073444,22.5005537 26.7040823,23.1971812 26.7040823,24.0565148 C26.7040823,24.9158484 27.4073444,25.612476 28.2748621,25.612476 C29.1423799,25.612476 29.8456419,24.9158484 29.8456419,24.0565148 L29.8456419,24.0565148 Z"></path>
@@ -154,7 +157,7 @@
       <a href="https://github.com/electron/electron">Repository</a>
       <a href="http://electron.atom.io/blog">Blog</a>
     </div>
-  </header>
+  </div>
 
   <div class="container">
 

From 7074789011541b72ef838107baa2a1d68ef9cd76 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 4 May 2016 17:43:21 +0900
Subject: [PATCH 002/510] Remove some unnecessary css rules

---
 default_app/index.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/default_app/index.html b/default_app/index.html
index a6126e5de6c7..b7910f00ef84 100644
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -4,11 +4,7 @@
   <style>
     body {
       color: #205161;
-      background-color: #fff;
       font-family: Roboto, -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", sans-serif;
-      font-style: normal;
-      font-variant: normal;
-      padding: 0;
       margin: 0;
       display: flex;
       flex-direction: column;
@@ -26,7 +22,6 @@
       border-bottom: 1px solid #1a1b23;
       color: #9feaf9;
       padding: 15px 30px;
-      margin: 0;
     }
 
     .header a,
@@ -104,7 +99,6 @@
       border-radius: 3px;
       font-size: 30px;
       font-weight: 300;
-      text-align: center;
       cursor: default;
       -webkit-user-select: none;
     }

From 28d12166fd0323875f0f591d6fcb484f615848b2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 4 May 2016 17:50:45 +0900
Subject: [PATCH 003/510] Fix margin of elements in flex

---
 default_app/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/default_app/index.html b/default_app/index.html
index b7910f00ef84..bb4ad681220e 100644
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -17,6 +17,10 @@
       flex-direction: column;
     }
 
+    .container > * {
+      margin: 15px 0 0 0;
+    }
+
     .header {
       background-color: #2f3241;
       border-bottom: 1px solid #1a1b23;

From edfb1b5d0e8af476cb65249f4e1790243ca9866d Mon Sep 17 00:00:00 2001
From: Lee Dohm <lee-dohm@github.com>
Date: Thu, 5 May 2016 13:48:44 -0700
Subject: [PATCH 004/510] :memo: Update to v1.4 of the Code of Conduct

Also, switch email address for reporting.
---
 CODE_OF_CONDUCT.md | 48 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 444ce0b4c821..e4d4c531e5a3 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,24 +1,46 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-- The use of sexualized language or imagery
-- Personal attacks
-- Trolling or insulting/derogatory comments
-- Public or private harassment
-- Publishing other's private information, such as physical or electronic addresses, without explicit permission
-- Other unethical or unprofessional conduct
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [atom@github.com](mailto:atom@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
+## Enforcement
 
-This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [electron@github.com](mailto:electron@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

From 45b3bd3a22848f9913fd80c772b9673afb52f344 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Fri, 6 May 2016 02:52:59 +0530
Subject: [PATCH 005/510] ipcRenderer: fix crash with multiple listeners to
 sync message

---
 atom/browser/api/event.cc |  5 ++++-
 spec/api-ipc-spec.js      | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/atom/browser/api/event.cc b/atom/browser/api/event.cc
index f456cf2758bb..2554e4ad0dab 100644
--- a/atom/browser/api/event.cc
+++ b/atom/browser/api/event.cc
@@ -45,7 +45,10 @@ bool Event::SendReply(const base::string16& json) {
     return false;
 
   AtomViewHostMsg_Message_Sync::WriteReplyParams(message_, json);
-  return sender_->Send(message_);
+  bool success = sender_->Send(message_);
+  message_ = NULL;
+  sender_ = NULL;
+  return success;
 }
 
 // static
diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index c98689287cea..d865be967844 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -200,6 +200,21 @@ describe('ipc module', function () {
       })
       w.loadURL('file://' + path.join(fixtures, 'api', 'send-sync-message.html'))
     })
+
+    it('does not crash when reply is sent by multiple listeners', function (done) {
+      var w = new BrowserWindow({
+        show: false
+      })
+      ipcMain.on('send-sync-message', function (event) {
+        event.returnValue = null
+      })
+      ipcMain.on('send-sync-message', function (event) {
+        event.returnValue = null
+        w.destroy()
+        done()
+      })
+      w.loadURL('file://' + path.join(fixtures, 'api', 'send-sync-message.html'))
+    })
   })
 
   describe('remote listeners', function () {

From 69c4c7e3be2c95523587fc4d6a645c21d4d46ddf Mon Sep 17 00:00:00 2001
From: Charlie Hess <ifightnoman@gmail.com>
Date: Thu, 5 May 2016 15:52:00 -0700
Subject: [PATCH 006/510] Clarify how did-fail-load handles redirects.

---
 docs/api/web-contents.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index f304ad98d7b1..3800388b56e3 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -39,6 +39,8 @@ Returns:
 This event is like `did-finish-load` but emitted when the load failed or was
 cancelled, e.g. `window.stop()` is invoked.
 The full list of error codes and their meaning is available [here](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
+Note that redirect responses will emit `errorCode` -3; you may want to ignore
+that error explicitly.
 
 ### Event: 'did-frame-finish-load'
 

From a4405dad454a5e19529f03333ff0748e2661cede Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 6 May 2016 14:21:19 +0900
Subject: [PATCH 007/510] docs: Make it clear that size constraints only apply
 for users

[ci skip]
---
 docs/api/browser-window.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index ea8822059835..895547c46e85 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -96,6 +96,11 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `webPreferences` Object - Settings of web page's features. See more about
     this below.
 
+When setting minimum or maximum window size with `minWidth`/`maxWidth`/
+`minHeight`/`maxHeight`, it only constrains the users, it won't prevent you from
+passing a size that does not follow size constraints to `setBounds`/`setSize` or
+to the constructor of `BrowserWindow`.
+
 The possible values and behaviors of `type` option are platform dependent,
 supported values are:
 

From df397dab305d881a8e80dd59296f62e22df8adce Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 6 May 2016 14:57:43 +0900
Subject: [PATCH 008/510] Add scrollBounce option and disable it by default

---
 atom/browser/web_contents_preferences.cc |  8 ++++++++
 atom/common/options_switches.cc          |  4 ++++
 atom/common/options_switches.h           |  2 ++
 atom/renderer/atom_renderer_client.cc    | 19 +++++++++++++++++++
 docs/api/browser-window.md               |  2 ++
 5 files changed, 35 insertions(+)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 05286a2d3ba4..41db39b56c97 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -141,6 +141,14 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
     command_line->AppendSwitchASCII(switches::kOpenerID,
                                     base::IntToString(opener_id));
 
+#if defined(OS_MACOSX)
+  // Enable scroll bounce.
+  bool scroll_bounce;
+  if (web_preferences.GetBoolean(options::kScrollBounce, &scroll_bounce) &&
+      scroll_bounce)
+    command_line->AppendSwitch(switches::kScrollBounce);
+#endif
+
   // Enable blink features.
   std::string blink_features;
   if (web_preferences.GetString(options::kBlinkFeatures, &blink_features))
diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index 562171d51f25..166942db962c 100644
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -103,6 +103,9 @@ const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
 // Opener window's ID.
 const char kOpenerID[] = "openerId";
 
+// Enable the rubber banding effect.
+const char kScrollBounce[] = "scrollBounce";
+
 // Enable blink features.
 const char kBlinkFeatures[] = "blinkFeatures";
 
@@ -146,6 +149,7 @@ const char kPreloadURL[]      = "preload-url";
 const char kNodeIntegration[] = "node-integration";
 const char kGuestInstanceID[] = "guest-instance-id";
 const char kOpenerID[]        = "opener-id";
+const char kScrollBounce[]    = "scroll-bounce";
 
 // Widevine options
 // Path to Widevine CDM binaries.
diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index 5746a7bbfe54..653f35a812bf 100644
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -56,6 +56,7 @@ extern const char kGuestInstanceID[];
 extern const char kExperimentalFeatures[];
 extern const char kExperimentalCanvasFeatures[];
 extern const char kOpenerID[];
+extern const char kScrollBounce[];
 extern const char kBlinkFeatures[];
 
 }   // namespace options
@@ -82,6 +83,7 @@ extern const char kPreloadURL[];
 extern const char kNodeIntegration[];
 extern const char kGuestInstanceID[];
 extern const char kOpenerID[];
+extern const char kScrollBounce[];
 
 extern const char kWidevineCdmPath[];
 extern const char kWidevineCdmVersion[];
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 4bb3cd2168c8..d090d8a10be5 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -36,6 +36,11 @@
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#include "base/strings/sys_string_conversions.h"
+#endif
+
 #if defined(OS_WIN)
 #include <shlobj.h>
 #endif
@@ -97,6 +102,7 @@ void AtomRendererClient::RenderThreadStarted() {
   content::RenderThread::Get()->AddObserver(this);
 
 #if defined(OS_WIN)
+  // Set ApplicationUserModelID in renderer process.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::string16 app_id =
       command_line->GetSwitchValueNative(switches::kAppUserModelId);
@@ -104,6 +110,19 @@ void AtomRendererClient::RenderThreadStarted() {
     SetCurrentProcessExplicitAppUserModelID(app_id.c_str());
   }
 #endif
+
+#if defined(OS_MACOSX)
+  // Disable rubber banding by default.
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (!command_line->HasSwitch(switches::kScrollBounce)) {
+    base::ScopedCFTypeRef<CFStringRef> key(
+        base::SysUTF8ToCFStringRef("NSScrollViewRubberbanding"));
+    base::ScopedCFTypeRef<CFStringRef> value(
+        base::SysUTF8ToCFStringRef("false"));
+    CFPreferencesSetAppValue(key, value, kCFPreferencesCurrentApplication);
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+  }
+#endif
 }
 
 void AtomRendererClient::RenderFrameCreated(
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 895547c46e85..d4ed6c03322c 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -170,6 +170,8 @@ The `webPreferences` option is an object that can have following properties:
   canvas features. Default is `false`.
 * `directWrite` Boolean - Enables DirectWrite font rendering system on
   Windows. Default is `true`.
+* `scrollBounce` Boolean - Enables scroll bounce (rubber banding) effect on
+  OS X. Default is `false`.
 * `blinkFeatures` String - A list of feature strings separated by `,`, like
   `CSSVariables,KeyboardEventKey`. The full list of supported feature strings
   can be found in the [setFeatureEnabledFromString][blink-feature-string]

From c18880bd778fd00ac1a3e3c1a26f0c84ce6525df Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 6 May 2016 21:48:51 +0900
Subject: [PATCH 009/510] Add a flag indicating app is started from default app

---
 default_app/main.js | 3 +++
 docs/api/process.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/default_app/main.js b/default_app/main.js
index cf71277c19d5..2bc1ac7743ae 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -230,6 +230,9 @@ if (option.modules.length > 0) {
 }
 
 function loadApplicationPackage (packagePath) {
+  // Add a flag indicating app is started from default app.
+  process.defaultApp = true
+
   try {
     // Override app name and version.
     packagePath = path.resolve(packagePath)
diff --git a/docs/api/process.md b/docs/api/process.md
index 82680e1e0d73..ab637e8a2b9e 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -14,6 +14,9 @@ upstream node:
   other builds it is `undefined`.
 * `process.windowsStore` Boolean - If the app is running as a Windows Store app
   (appx), this value is `true`, for other builds it is `undefined`.
+* `process.defaultApp` Boolean - When app is started by being passed as parameter
+  to the default app, this value is `true` in the main process, otherwise it is
+  `undefined`.
 
 ## Events
 

From 0e8636cb2aaf02c963e226ee05785a01ff5044c4 Mon Sep 17 00:00:00 2001
From: Jessica Lord <jlord@github.com>
Date: Fri, 6 May 2016 18:56:07 +0200
Subject: [PATCH 010/510] Fix spacing on lines and url

---
 docs/api/app.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 1f682933d233..77174958abd0 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -386,12 +386,12 @@ default protocol handler.
 
 ### `app.isDefaultProtocolClient(protocol)` _OS X_ _Windows_
 
-* `protocol` String - The name of your protocol, without `://`. 
+* `protocol` String - The name of your protocol, without `://`.
 
 This method checks if the current executable is the default handler for a protocol
-(aka URI scheme). If so, it will return true. Otherwise, it will return false. 
+(aka URI scheme). If so, it will return true. Otherwise, it will return false.
 
-**Note:** On OS X, you can use this method to check if the app has been registered as the default protocol handler for a protocol. You can also verify this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the OS X machine. 
+**Note:** On OS X, you can use this method to check if the app has been registered as the default protocol handler for a protocol. You can also verify this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the OS X machine.
 Please refer to [Apple's documentation][LSCopyDefaultHandlerForURLScheme] for details.
 
 The API uses the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
@@ -568,5 +568,4 @@ Sets the `image` associated with this dock icon.
 [tasks]:http://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#tasks
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
 [CFBundleURLTypes]: https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/TP40009249-102207-TPXREF115
-[LSCopyDefaultHandlerForURLScheme]: 
-https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme
+[LSCopyDefaultHandlerForURLScheme]: https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme

From f84b5a76427e16ca05588e364591e29ccd15a687 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 6 May 2016 10:05:12 -0700
Subject: [PATCH 011/510] Link to electron-winstaller

---
 docs/api/auto-updater.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/api/auto-updater.md b/docs/api/auto-updater.md
index 211d0c69a5f3..66ddbca96560 100644
--- a/docs/api/auto-updater.md
+++ b/docs/api/auto-updater.md
@@ -30,8 +30,9 @@ This is a requirement of `Squirrel.Mac`.
 ### Windows
 
 On Windows, you have to install your app into a user's machine before you can
-use the auto-updater, so it is recommended to use
-[grunt-electron-installer][installer] module to generate a Windows installer.
+use the `autoUpdater`, so it is recommended that you use the
+[electron-winstaller][installer-lib] module or the [grunt-electron-installer][installer]
+package to generate a Windows installer.
 
 The installer generated with Squirrel will create a shortcut icon with an
 [Application User Model ID][app-user-model-id] in the format of
@@ -111,7 +112,8 @@ should only be called after `update-downloaded` has been emitted.
 [squirrel-mac]: https://github.com/Squirrel/Squirrel.Mac
 [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
 [squirrel-windows]: https://github.com/Squirrel/Squirrel.Windows
-[installer]: https://github.com/atom/grunt-electron-installer
+[installer]: https://github.com/electron/grunt-electron-installer
+[installer-lib]: https://github.com/electron/windows-installer
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
 [electron-release-server]: https://github.com/ArekSredzki/electron-release-server
 [squirrel-updates-server]: https://github.com/Aluxian/squirrel-updates-server

From 7cca287b602ea52e2c61b33fb761183845421adf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 6 May 2016 10:09:24 -0700
Subject: [PATCH 012/510] Update links to electron org

---
 docs/api/crash-reporter.md                | 2 +-
 docs/tutorial/application-distribution.md | 2 +-
 docs/tutorial/application-packaging.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api/crash-reporter.md b/docs/api/crash-reporter.md
index 1f8229eaa792..c7645048fed0 100644
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -20,7 +20,7 @@ For setting up a server to accept and process crash reports, you can use
 following projects:
 
 * [socorro](https://github.com/mozilla/socorro)
-* [mini-breakpad-server](https://github.com/atom/mini-breakpad-server)
+* [mini-breakpad-server](https://github.com/electron/mini-breakpad-server)
 
 ## Methods
 
diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index 313c924e881c..a5d0f3797c83 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -30,7 +30,7 @@ your distribution to deliver to final users.
 ## Packaging Your App into a File
 
 Apart from shipping your app by copying all of its source files, you can also
-package your app into an [asar](https://github.com/atom/asar) archive to avoid
+package your app into an [asar](https://github.com/electron/asar) archive to avoid
 exposing your app's source code to users.
 
 To use an `asar` archive to replace the `app` folder, you need to rename the
diff --git a/docs/tutorial/application-packaging.md b/docs/tutorial/application-packaging.md
index b42a2f9298ba..b74e32b6929c 100644
--- a/docs/tutorial/application-packaging.md
+++ b/docs/tutorial/application-packaging.md
@@ -181,4 +181,4 @@ After running the command, apart from the `app.asar`, there is also an
 `app.asar.unpacked` folder generated which contains the unpacked files, you
 should copy it together with `app.asar` when shipping it to users.
 
-[asar]: https://github.com/atom/asar
+[asar]: https://github.com/electron/asar

From dae68be2ce8209a8c18dcd745a8b1215d1e13ae6 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:38:05 -0700
Subject: [PATCH 013/510] Remove deprecated APIs

---
 lib/browser/api/app.js            | 53 +------------------------------
 lib/browser/api/auto-updater.js   |  5 ---
 lib/browser/api/browser-window.js | 28 ----------------
 lib/browser/api/ipc.js            |  5 ---
 lib/browser/api/tray.js           |  7 ----
 lib/browser/api/web-contents.js   |  8 -----
 lib/common/api/native-image.js    |  8 +----
 lib/renderer/api/web-frame.js     |  6 ----
 lib/renderer/web-view/web-view.js |  3 --
 9 files changed, 2 insertions(+), 121 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 0487270ce7b3..f8a4d3e2913e 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const electron = require('electron')
-const {deprecate, session, Menu} = electron
+const {session, Menu} = electron
 const EventEmitter = require('events').EventEmitter
 
 const bindings = process.atomBinding('app')
@@ -63,61 +63,10 @@ for (i = 0, len = ref1.length; i < len; i++) {
   fn(ref1[i])
 }
 
-// Deprecated.
-app.getHomeDir = deprecate('app.getHomeDir', 'app.getPath', function () {
-  return this.getPath('home')
-})
-app.getDataPath = deprecate('app.getDataPath', 'app.getPath', function () {
-  return this.getPath('userData')
-})
-app.setDataPath = deprecate('app.setDataPath', 'app.setPath', function (path) {
-  return this.setPath('userData', path)
-})
-app.resolveProxy = deprecate('app.resolveProxy', 'session.defaultSession.resolveProxy', function (url, callback) {
-  return session.defaultSession.resolveProxy(url, callback)
-})
-deprecate.rename(app, 'terminate', 'quit')
-deprecate.event(app, 'finish-launching', 'ready', function () {
-  // give default app a chance to setup default menu.
-  setImmediate(() => {
-    this.emit('finish-launching')
-  })
-})
-deprecate.event(app, 'activate-with-no-open-windows', 'activate', function (event, hasVisibleWindows) {
-  if (!hasVisibleWindows) {
-    return this.emit('activate-with-no-open-windows', event)
-  }
-})
-deprecate.event(app, 'select-certificate', 'select-client-certificate')
-if (process.platform === 'win32') {
-  app.isAeroGlassEnabled = deprecate('app.isAeroGlassEnabled', 'systemPreferences.isAeroGlassEnabled', function () {
-    return electron.systemPreferences.isAeroGlassEnabled()
-  })
-} else if (process.platform === 'darwin') {
-  app.isDarkMode = deprecate('app.isDarkMode', 'systemPreferences.isDarkMode', function () {
-    return electron.systemPreferences.isDarkMode()
-  })
-  app.on = app.addListener = function (event, listener) {
-    if (event === 'platform-theme-changed') {
-      deprecate.warn('platform-theme-changed event', "systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', callback)")
-      electron.systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', function () {
-        app.emit('platform-theme-changed')
-      })
-    }
-    EventEmitter.prototype.addListener.call(app, event, listener)
-  }
-}
-
 // Wrappers for native classes.
 var wrapDownloadItem = function (downloadItem) {
   // downloadItem is an EventEmitter.
   Object.setPrototypeOf(downloadItem, EventEmitter.prototype)
-
-  // Deprecated.
-  deprecate.property(downloadItem, 'url', 'getURL')
-  deprecate.property(downloadItem, 'filename', 'getFilename')
-  deprecate.property(downloadItem, 'mimeType', 'getMimeType')
-  return deprecate.rename(downloadItem, 'getUrl', 'getURL')
 }
 
 downloadItemBindings._setWrapDownloadItem(wrapDownloadItem)
diff --git a/lib/browser/api/auto-updater.js b/lib/browser/api/auto-updater.js
index 2b5133070f41..f99d3218e430 100644
--- a/lib/browser/api/auto-updater.js
+++ b/lib/browser/api/auto-updater.js
@@ -1,7 +1,2 @@
-const deprecate = require('electron').deprecate
 const autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native')
-
-// Deprecated.
-deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL')
-
 module.exports = autoUpdater
diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index c9d63278f974..7eec5c1cc441 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -196,34 +196,6 @@ BrowserWindow.prototype.inspectServiceWorker = function () {
   return this.webContents.inspectServiceWorker()
 }
 
-// Deprecated.
-deprecate.member(BrowserWindow, 'undo', 'webContents')
-deprecate.member(BrowserWindow, 'redo', 'webContents')
-deprecate.member(BrowserWindow, 'cut', 'webContents')
-deprecate.member(BrowserWindow, 'copy', 'webContents')
-deprecate.member(BrowserWindow, 'paste', 'webContents')
-deprecate.member(BrowserWindow, 'selectAll', 'webContents')
-deprecate.member(BrowserWindow, 'reloadIgnoringCache', 'webContents')
-deprecate.member(BrowserWindow, 'isLoading', 'webContents')
-deprecate.member(BrowserWindow, 'isWaitingForResponse', 'webContents')
-deprecate.member(BrowserWindow, 'stop', 'webContents')
-deprecate.member(BrowserWindow, 'isCrashed', 'webContents')
-deprecate.member(BrowserWindow, 'print', 'webContents')
-deprecate.member(BrowserWindow, 'printToPDF', 'webContents')
-deprecate.rename(BrowserWindow, 'restart', 'reload')
-deprecate.rename(BrowserWindow, 'loadUrl', 'loadURL')
-deprecate.rename(BrowserWindow, 'getUrl', 'getURL')
-
-BrowserWindow.prototype.executeJavaScriptInDevTools = deprecate('executeJavaScriptInDevTools', 'devToolsWebContents.executeJavaScript', function (code) {
-  var ref1
-  return (ref1 = this.devToolsWebContents) != null ? ref1.executeJavaScript(code) : void 0
-})
-
-BrowserWindow.prototype.getPageTitle = deprecate('getPageTitle', 'webContents.getTitle', function () {
-  var ref1
-  return (ref1 = this.webContents) != null ? ref1.getTitle() : void 0
-})
-
 const isDeprecatedKey = function (key) {
   return key.indexOf('-') >= 0
 }
diff --git a/lib/browser/api/ipc.js b/lib/browser/api/ipc.js
index cdba49c82485..6b7f04d2aed2 100644
--- a/lib/browser/api/ipc.js
+++ b/lib/browser/api/ipc.js
@@ -1,7 +1,2 @@
-const deprecate = require('electron').deprecate
 const ipcMain = require('electron').ipcMain
-
-// This module is deprecated, we mirror everything from ipcMain.
-deprecate.warn('ipc module', 'require("electron").ipcMain')
-
 module.exports = ipcMain
diff --git a/lib/browser/api/tray.js b/lib/browser/api/tray.js
index ce67dbe117a2..5142120a5695 100644
--- a/lib/browser/api/tray.js
+++ b/lib/browser/api/tray.js
@@ -1,16 +1,9 @@
-const deprecate = require('electron').deprecate
 const EventEmitter = require('events').EventEmitter
 const Tray = process.atomBinding('tray').Tray
 
 Object.setPrototypeOf(Tray.prototype, EventEmitter.prototype)
 
 Tray.prototype._init = function () {
-  // Deprecated.
-  deprecate.rename(this, 'popContextMenu', 'popUpContextMenu')
-  deprecate.event(this, 'clicked', 'click')
-  deprecate.event(this, 'double-clicked', 'double-click')
-  deprecate.event(this, 'right-clicked', 'right-click')
-  return deprecate.event(this, 'balloon-clicked', 'balloon-click')
 }
 
 Tray.prototype.setContextMenu = function (menu) {
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 823351ebe116..0ccb51b19b09 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const EventEmitter = require('events').EventEmitter
-const deprecate = require('electron').deprecate
 const ipcMain = require('electron').ipcMain
 const NavigationController = require('electron').NavigationController
 const Menu = require('electron').Menu
@@ -160,13 +159,6 @@ let wrapWebContents = function (webContents) {
     })
   })
 
-  // Deprecated.
-  deprecate.rename(webContents, 'loadUrl', 'loadURL')
-  deprecate.rename(webContents, 'getUrl', 'getURL')
-  deprecate.event(webContents, 'page-title-set', 'page-title-updated', function (...args) {
-    return this.emit.apply(this, ['page-title-set'].concat(args))
-  })
-
   webContents.printToPDF = function (options, callback) {
     var printingSetting
     printingSetting = {
diff --git a/lib/common/api/native-image.js b/lib/common/api/native-image.js
index ebb06138210e..614298f51a0e 100644
--- a/lib/common/api/native-image.js
+++ b/lib/common/api/native-image.js
@@ -1,7 +1 @@
-const deprecate = require('electron').deprecate
-const nativeImage = process.atomBinding('native_image')
-
-// Deprecated.
-deprecate.rename(nativeImage, 'createFromDataUrl', 'createFromDataURL')
-
-module.exports = nativeImage
+module.exports = process.atomBinding('native_image')
diff --git a/lib/renderer/api/web-frame.js b/lib/renderer/api/web-frame.js
index 4a152d4f3646..81855c391f8f 100644
--- a/lib/renderer/api/web-frame.js
+++ b/lib/renderer/api/web-frame.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const deprecate = require('electron').deprecate
 const EventEmitter = require('events').EventEmitter
 
 const webFrame = process.atomBinding('web_frame').webFrame
@@ -11,9 +10,4 @@ Object.setPrototypeOf(webFrame, EventEmitter.prototype)
 // Lots of webview would subscribe to webFrame's events.
 webFrame.setMaxListeners(0)
 
-// Deprecated.
-deprecate.rename(webFrame, 'registerUrlSchemeAsSecure', 'registerURLSchemeAsSecure')
-deprecate.rename(webFrame, 'registerUrlSchemeAsBypassingCSP', 'registerURLSchemeAsBypassingCSP')
-deprecate.rename(webFrame, 'registerUrlSchemeAsPrivileged', 'registerURLSchemeAsPrivileged')
-
 module.exports = webFrame
diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index 20f5f07465b5..bfe5197295c0 100644
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const deprecate = require('electron').deprecate
 const webFrame = require('electron').webFrame
 const remote = require('electron').remote
 const ipcRenderer = require('electron').ipcRenderer
@@ -432,8 +431,6 @@ var registerWebViewElement = function () {
     return internal.webContents
   }
 
-  // Deprecated.
-  deprecate.rename(proto, 'getUrl', 'getURL')
   window.WebView = webFrame.registerEmbedderCustomElement('webview', {
     prototype: proto
   })

From 0342db9328211a5d79ac930b0e1b29fa4f1cf521 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:39:37 -0700
Subject: [PATCH 014/510] Remove hyphenated options

---
 lib/renderer/override.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/renderer/override.js b/lib/renderer/override.js
index db56eadd3484..bb09a9981dce 100644
--- a/lib/renderer/override.js
+++ b/lib/renderer/override.js
@@ -85,9 +85,8 @@ window.open = function (url, frameName, features) {
   }
   options = {}
 
-  // TODO remove hyphenated options in both of the following arrays for 1.0
-  const ints = ['x', 'y', 'width', 'height', 'min-width', 'minWidth', 'max-width', 'maxWidth', 'min-height', 'minHeight', 'max-height', 'maxHeight', 'zoom-factor', 'zoomFactor']
-  const webPreferences = ['zoom-factor', 'zoomFactor', 'node-integration', 'nodeIntegration', 'preload']
+  const ints = ['x', 'y', 'width', 'height', 'minWidth', 'maxWidth', 'minHeight', 'maxHeight', 'zoomFactor']
+  const webPreferences = ['zoomFactor', 'nodeIntegration', 'preload']
   const disposition = 'new-window'
 
   // Make sure to get rid of excessive whitespace in the property name

From 6f0471f6cb129edc758929079c66ca62ea9211b4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:42:06 -0700
Subject: [PATCH 015/510] Remove deprecated options check in BrowserWindow

---
 atom/browser/api/atom_api_window.cc | 18 ----------
 lib/browser/api/browser-window.js   | 55 +----------------------------
 2 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index ae5eec64cf93..2ef065bf51c9 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -52,11 +52,6 @@ namespace api {
 
 namespace {
 
-// This function is implemented in JavaScript
-using DeprecatedOptionsCheckCallback =
-    base::Callback<std::string(v8::Local<v8::Value>)>;
-DeprecatedOptionsCheckCallback g_deprecated_options_check;
-
 void OnCapturePageDone(
     v8::Isolate* isolate,
     const base::Callback<void(const gfx::Image&)>& callback,
@@ -304,13 +299,6 @@ mate::WrappableBase* Window::New(v8::Isolate* isolate, mate::Arguments* args) {
     options = mate::Dictionary::CreateEmpty(isolate);
   }
 
-  std::string deprecation_message = g_deprecated_options_check.Run(
-      options.GetHandle());
-  if (deprecation_message.length() > 0) {
-    args->ThrowError(deprecation_message);
-    return nullptr;
-  }
-
   return new Window(isolate, options);
 }
 
@@ -822,10 +810,6 @@ v8::Local<v8::Value> Window::From(v8::Isolate* isolate,
     return v8::Null(isolate);
 }
 
-void SetDeprecatedOptionsCheck(const DeprecatedOptionsCheckCallback& callback) {
-  g_deprecated_options_check = callback;
-}
-
 }  // namespace api
 
 }  // namespace atom
@@ -848,8 +832,6 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
 
   mate::Dictionary dict(isolate, exports);
   dict.Set("BrowserWindow", browser_window);
-  dict.SetMethod("_setDeprecatedOptionsCheck",
-                 &atom::api::SetDeprecatedOptionsCheck);
 }
 
 }  // namespace
diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index 7eec5c1cc441..e433580ba638 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -1,9 +1,8 @@
 'use strict'
 
 const ipcMain = require('electron').ipcMain
-const deprecate = require('electron').deprecate
 const EventEmitter = require('events').EventEmitter
-const {BrowserWindow, _setDeprecatedOptionsCheck} = process.atomBinding('window')
+const {BrowserWindow} = process.atomBinding('window')
 
 Object.setPrototypeOf(BrowserWindow.prototype, EventEmitter.prototype)
 
@@ -196,56 +195,4 @@ BrowserWindow.prototype.inspectServiceWorker = function () {
   return this.webContents.inspectServiceWorker()
 }
 
-const isDeprecatedKey = function (key) {
-  return key.indexOf('-') >= 0
-}
-
-// Map deprecated key with hyphens to camel case key
-const getNonDeprecatedKey = function (deprecatedKey) {
-  return deprecatedKey.replace(/-./g, function (match) {
-    return match[1].toUpperCase()
-  })
-}
-
-// TODO Remove for 1.0
-const checkForDeprecatedOptions = function (options) {
-  if (!options) return ''
-
-  let keysToCheck = Object.keys(options)
-  if (options.webPreferences) {
-    keysToCheck = keysToCheck.concat(Object.keys(options.webPreferences))
-  }
-
-  // Check options for keys with hyphens in them
-  let deprecatedKey = keysToCheck.filter(isDeprecatedKey)[0]
-  if (deprecatedKey) {
-    try {
-      deprecate.warn(deprecatedKey, getNonDeprecatedKey(deprecatedKey))
-    } catch (error) {
-      // Return error message so it can be rethrown via C++
-      return error.message
-    }
-  }
-
-  let webPreferenceOption
-  if (options.hasOwnProperty('nodeIntegration')) {
-    webPreferenceOption = 'nodeIntegration'
-  } else if (options.hasOwnProperty('preload')) {
-    webPreferenceOption = 'preload'
-  } else if (options.hasOwnProperty('zoomFactor')) {
-    webPreferenceOption = 'zoomFactor'
-  }
-  if (webPreferenceOption) {
-    try {
-      deprecate.warn(`options.${webPreferenceOption}`, `options.webPreferences.${webPreferenceOption}`)
-    } catch (error) {
-      // Return error message so it can be rethrown via C++
-      return error.message
-    }
-  }
-
-  return ''
-}
-_setDeprecatedOptionsCheck(checkForDeprecatedOptions)
-
 module.exports = BrowserWindow

From a6cf7a10954c2615f6c6721a92ca21f4508efdc4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:48:13 -0700
Subject: [PATCH 016/510] Remove deprecated crashReporter.start options

---
 lib/common/api/crash-reporter.js | 15 +++------------
 spec/api-crash-reporter-spec.js  |  6 +++---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js
index f10887550113..e62c7cdf95f9 100644
--- a/lib/common/api/crash-reporter.js
+++ b/lib/common/api/crash-reporter.js
@@ -10,7 +10,7 @@ var CrashReporter = (function () {
   function CrashReporter () {}
 
   CrashReporter.prototype.start = function (options) {
-    var app, args, autoSubmit, companyName, deprecate, env, extra, ignoreSystemCrashHandler, start, submitURL
+    var app, args, autoSubmit, companyName, env, extra, ignoreSystemCrashHandler, start, submitURL
     if (options == null) {
       options = {}
     }
@@ -21,14 +21,6 @@ var CrashReporter = (function () {
     ignoreSystemCrashHandler = options.ignoreSystemCrashHandler
     extra = options.extra
 
-    // Deprecated.
-    deprecate = electron.deprecate
-    if (options.submitUrl) {
-      if (submitURL == null) {
-        submitURL = options.submitUrl
-      }
-      deprecate.warn('submitUrl', 'submitURL')
-    }
     app = (process.type === 'browser' ? electron : electron.remote).app
     if (this.productName == null) {
       this.productName = app.getName()
@@ -52,11 +44,10 @@ var CrashReporter = (function () {
       extra._version = app.getVersion()
     }
     if (companyName == null) {
-      deprecate.log('companyName is now a required option to crashReporter.start')
-      return
+      throw new Error('companyName is a required option to crashReporter.start')
     }
     if (submitURL == null) {
-      deprecate.log('submitURL is now a required option to crashReporter.start')
+      throw new Error('submitURL is a required option to crashReporter.start')
       return
     }
     start = () => {
diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
index e5a3223eed8f..4bf02af2ef5d 100644
--- a/spec/api-crash-reporter-spec.js
+++ b/spec/api-crash-reporter-spec.js
@@ -75,18 +75,18 @@ describe('crash-reporter module', function () {
     })
   })
 
-  describe('.start(options)', function () {
+  describe.only('.start(options)', function () {
     it('requires that the companyName and submitURL options be specified', function () {
       assert.throws(function () {
         crashReporter.start({
           companyName: 'Missing submitURL'
         })
-      })
+      }, /submitURL is a required option to crashReporter\.start/)
       assert.throws(function () {
         crashReporter.start({
           submitURL: 'Missing companyName'
         })
-      })
+      }, /companyName is a required option to crashReporter\.start/)
     })
   })
 })

From d988cae16d8d6ee45474033ab8cb72d00e01918b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:49:48 -0700
Subject: [PATCH 017/510] Remove deprecated ipc module

---
 lib/renderer/api/ipc.js | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 lib/renderer/api/ipc.js

diff --git a/lib/renderer/api/ipc.js b/lib/renderer/api/ipc.js
deleted file mode 100644
index 25519a308daf..000000000000
--- a/lib/renderer/api/ipc.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const ipcRenderer = require('electron').ipcRenderer
-const deprecate = require('electron').deprecate
-const EventEmitter = require('events').EventEmitter
-
-// This module is deprecated, we mirror everything from ipcRenderer.
-deprecate.warn('ipc module', 'require("electron").ipcRenderer')
-
-// Routes events of ipcRenderer.
-var ipc = new EventEmitter()
-
-ipcRenderer.emit = function (channel, event, ...args) {
-  ipc.emit.apply(ipc, [channel].concat(args))
-  return EventEmitter.prototype.emit.apply(ipcRenderer, arguments)
-}
-
-// Deprecated.
-for (var method in ipcRenderer) {
-  if (method.startsWith('send')) {
-    ipc[method] = ipcRenderer[method]
-  }
-}
-
-deprecate.rename(ipc, 'sendChannel', 'send')
-
-deprecate.rename(ipc, 'sendChannelSync', 'sendSync')
-
-module.exports = ipc

From bf91410a22c06f4649117245af0606b3b59d043a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:50:33 -0700
Subject: [PATCH 018/510] Remove deprecated main process ipc module

---
 lib/browser/api/ipc.js | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 lib/browser/api/ipc.js

diff --git a/lib/browser/api/ipc.js b/lib/browser/api/ipc.js
deleted file mode 100644
index 6b7f04d2aed2..000000000000
--- a/lib/browser/api/ipc.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const ipcMain = require('electron').ipcMain
-module.exports = ipcMain

From dafa14fe42f3c6b52534e5c9f041386a180791ea Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:52:22 -0700
Subject: [PATCH 019/510] Don't export deprecate API

---
 lib/common/api/exports/electron.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/common/api/exports/electron.js b/lib/common/api/exports/electron.js
index 3bef1f0c50f6..25ef2640d599 100644
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -29,12 +29,6 @@ exports.defineProperties = function (exports) {
         return require('../crash-reporter')
       }
     },
-    deprecations: {
-      enumerable: true,
-      get: function () {
-        return require('../deprecations')
-      }
-    },
     nativeImage: {
       enumerable: true,
       get: function () {
@@ -53,11 +47,6 @@ exports.defineProperties = function (exports) {
       get: function () {
         return require('../callbacks-registry')
       }
-    },
-    deprecate: {
-      get: function () {
-        return require('../deprecate')
-      }
     }
   })
 }

From 2ce4237083d1b21d3f38e74d88016a3d3725fdb4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:54:22 -0700
Subject: [PATCH 020/510] Remove hideInternalModules API

---
 lib/browser/init.js                |  4 ----
 lib/common/api/exports/electron.js | 14 --------------
 lib/common/init.js                 |  5 -----
 lib/renderer/init.js               |  4 ----
 4 files changed, 27 deletions(-)

diff --git a/lib/browser/init.js b/lib/browser/init.js
index fc4f90c399ba..df670ece7100 100644
--- a/lib/browser/init.js
+++ b/lib/browser/init.js
@@ -18,10 +18,6 @@ require('../common/init')
 
 var globalPaths = Module.globalPaths
 
-if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
-  globalPaths.push(path.join(__dirname, 'api'))
-}
-
 // Expose public APIs.
 globalPaths.push(path.join(__dirname, 'api', 'exports'))
 
diff --git a/lib/common/api/exports/electron.js b/lib/common/api/exports/electron.js
index 25ef2640d599..65da6c5d2b91 100644
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -1,20 +1,6 @@
-// Do not expose the internal modules to `require`.
-const hideInternalModules = function () {
-  var globalPaths = require('module').globalPaths
-  if (globalPaths.length === 3) {
-    // Remove the "common/api/lib" and "browser-or-renderer/api/lib".
-    return globalPaths.splice(0, 2)
-  }
-}
-
 // Attaches properties to |exports|.
 exports.defineProperties = function (exports) {
   return Object.defineProperties(exports, {
-    hideInternalModules: {
-      enumerable: true,
-      value: hideInternalModules
-    },
-
     // Common modules, please sort with alphabet order.
     clipboard: {
       // Must be enumerable, otherwise it woulde be invisible to remote module.
diff --git a/lib/common/init.js b/lib/common/init.js
index 11c098d3ce5c..1b90b9343441 100644
--- a/lib/common/init.js
+++ b/lib/common/init.js
@@ -12,11 +12,6 @@ process.atomBinding = function (name) {
   }
 }
 
-if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
-  // Add common/api/lib to module search paths.
-  Module.globalPaths.push(path.join(__dirname, 'api'))
-}
-
 // setImmediate and process.nextTick makes use of uv_check and uv_prepare to
 // run the callbacks, however since we only run uv loop on requests, the
 // callbacks wouldn't be called until something else activated the uv loop,
diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index a9f4acc5cbfe..fadf95256865 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -16,10 +16,6 @@ require('../common/init')
 
 var globalPaths = Module.globalPaths
 
-if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
-  globalPaths.push(path.join(__dirname, 'api'))
-}
-
 // Expose public APIs.
 globalPaths.push(path.join(__dirname, 'api', 'exports'))
 

From 1e140fb32c024c83aa6966755a175f7fc70ec69a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:57:55 -0700
Subject: [PATCH 021/510] Remove ipc.js files

---
 filenames.gypi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/filenames.gypi b/filenames.gypi
index 1c2139497567..f2a8615a61b6 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -18,7 +18,6 @@
       'lib/browser/api/dialog.js',
       'lib/browser/api/exports/electron.js',
       'lib/browser/api/global-shortcut.js',
-      'lib/browser/api/ipc.js',
       'lib/browser/api/ipc-main.js',
       'lib/browser/api/menu.js',
       'lib/browser/api/menu-item.js',
@@ -58,7 +57,6 @@
       'lib/renderer/web-view/web-view-constants.js',
       'lib/renderer/api/desktop-capturer.js',
       'lib/renderer/api/exports/electron.js',
-      'lib/renderer/api/ipc.js',
       'lib/renderer/api/ipc-renderer.js',
       'lib/renderer/api/remote.js',
       'lib/renderer/api/screen.js',

From ef801d5543eb59c59a6aa6428313367b39186209 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:58:04 -0700
Subject: [PATCH 022/510] Remove .only call

---
 spec/api-crash-reporter-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
index 4bf02af2ef5d..b4f63fe1ef27 100644
--- a/spec/api-crash-reporter-spec.js
+++ b/spec/api-crash-reporter-spec.js
@@ -75,7 +75,7 @@ describe('crash-reporter module', function () {
     })
   })
 
-  describe.only('.start(options)', function () {
+  describe('.start(options)', function () {
     it('requires that the companyName and submitURL options be specified', function () {
       assert.throws(function () {
         crashReporter.start({

From bea232f53aae354cd0adf43ead628f60fbb7e306 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 09:58:59 -0700
Subject: [PATCH 023/510] Update specs for internal module require

---
 spec/api-app-spec.js | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js
index 1c20ef8e4523..d631d9ae830c 100644
--- a/spec/api-app-spec.js
+++ b/spec/api-app-spec.js
@@ -9,21 +9,10 @@ const app = remote.require('electron').app
 const BrowserWindow = remote.require('electron').BrowserWindow
 
 describe('electron module', function () {
-  it('allows old style require by default', function () {
-    require('shell')
-  })
-
-  it('can prevent exposing internal modules to require', function (done) {
-    const electron = require('electron')
-    const clipboard = require('clipboard')
-    assert.equal(typeof clipboard, 'object')
-    electron.hideInternalModules()
-    try {
+  it('prevents exposing internal modules to require', function () {
+    assert.throws(function () {
       require('clipboard')
-    } catch (err) {
-      assert.equal(err.message, "Cannot find module 'clipboard'")
-      done()
-    }
+    }, /Cannot find module 'clipboard'/)
   })
 })
 

From 4cb620c195061a20371f2ec7f9d1a21368296937 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 10:02:34 -0700
Subject: [PATCH 024/510] Remove support for translating hyphenated options

---
 atom/browser/api/atom_api_window.cc | 49 -----------------------------
 1 file changed, 49 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 2ef065bf51c9..e2eb44ff48c5 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -61,52 +61,6 @@ void OnCapturePageDone(
   callback.Run(gfx::Image::CreateFrom1xBitmap(bitmap));
 }
 
-// Converts min-width to minWidth, returns false if no conversion is needed.
-bool TranslateOldKey(const std::string& key, std::string* new_key) {
-  if (key.find('-') == std::string::npos)
-    return false;
-  new_key->reserve(key.size());
-  bool next_upper_case = false;
-  for (char c : key) {
-    if (c == '-') {
-      next_upper_case = true;
-    } else if (next_upper_case) {
-      new_key->push_back(base::ToUpperASCII(c));
-      next_upper_case = false;
-    } else {
-      new_key->push_back(c);
-    }
-  }
-  return true;
-}
-
-// Converts min-width to minWidth recursively in the dictionary.
-void TranslateOldOptions(v8::Isolate* isolate, v8::Local<v8::Object> options) {
-  auto context = isolate->GetCurrentContext();
-  auto maybe_keys = options->GetOwnPropertyNames(context);
-  if (maybe_keys.IsEmpty())
-    return;
-  std::vector<std::string> keys;
-  if (!mate::ConvertFromV8(isolate, maybe_keys.ToLocalChecked(), &keys))
-    return;
-  mate::Dictionary dict(isolate, options);
-  for (const auto& key : keys) {
-    v8::Local<v8::Value> value;
-    if (!dict.Get(key, &value))  // Shouldn't happen, but guard it anyway.
-      continue;
-    // Go recursively.
-    v8::Local<v8::Object> sub_options;
-    if (mate::ConvertFromV8(isolate, value, &sub_options))
-      TranslateOldOptions(isolate, sub_options);
-    // Translate key.
-    std::string new_key;
-    if (TranslateOldKey(key, &new_key)) {
-      dict.Set(new_key, value);
-      dict.Delete(key);
-    }
-  }
-}
-
 // Converts binary data to Buffer.
 v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
   auto buffer = node::Buffer::Copy(isolate, static_cast<char*>(val), size);
@@ -120,9 +74,6 @@ v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
 
 
 Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
-  // Be compatible with old style field names like min-width.
-  TranslateOldOptions(isolate, options.GetHandle());
-
   // Use options.webPreferences to create WebContents.
   mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
   options.Get(options::kWebPreferences, &web_preferences);

From 58473f41abb18ce55736c5baae2f71867294fe6a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 10:04:39 -0700
Subject: [PATCH 025/510] Remove deprecated BrowserWindow options specs

---
 spec/api-browser-window-spec.js | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index e76821020bdc..a8dd8a3780cc 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -880,24 +880,4 @@ describe('browser-window module', function () {
       w.loadURL(server.url)
     })
   })
-
-  describe('deprecated options', function () {
-    it('throws a deprecation error for option keys using hyphens instead of camel case', function () {
-      assert.throws(function () {
-        return new BrowserWindow({'min-width': 500})
-      }, 'min-width is deprecated. Use minWidth instead.')
-    })
-
-    it('throws a deprecation error for webPreference keys using hyphens instead of camel case', function () {
-      assert.throws(function () {
-        return new BrowserWindow({webPreferences: {'node-integration': false}})
-      }, 'node-integration is deprecated. Use nodeIntegration instead.')
-    })
-
-    it('throws a deprecation error for option keys that should be set on webPreferences', function () {
-      assert.throws(function () {
-        return new BrowserWindow({zoomFactor: 1})
-      }, 'options.zoomFactor is deprecated. Use options.webPreferences.zoomFactor instead.')
-    })
-  })
 })

From 7ad86a12b4c067bfd4e3aa18a5bbdf2cb12886e2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 10:10:47 -0700
Subject: [PATCH 026/510] Remove empty _init

---
 lib/browser/api/tray.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/browser/api/tray.js b/lib/browser/api/tray.js
index 5142120a5695..729e430ee3fd 100644
--- a/lib/browser/api/tray.js
+++ b/lib/browser/api/tray.js
@@ -3,9 +3,6 @@ const Tray = process.atomBinding('tray').Tray
 
 Object.setPrototypeOf(Tray.prototype, EventEmitter.prototype)
 
-Tray.prototype._init = function () {
-}
-
 Tray.prototype.setContextMenu = function (menu) {
   this._setContextMenu(menu)
 

From 16d4c436cbc731012d55b600a7b81afc85d9eb1a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 10:14:42 -0700
Subject: [PATCH 027/510] Keep exporting deprecate/deprecations

---
 lib/common/api/exports/electron.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/common/api/exports/electron.js b/lib/common/api/exports/electron.js
index 65da6c5d2b91..1e9c2d71f3b7 100644
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -33,6 +33,16 @@ exports.defineProperties = function (exports) {
       get: function () {
         return require('../callbacks-registry')
       }
+    },
+    deprecate: {
+      get: function () {
+        return require('../deprecate')
+      }
+    },
+    deprecations: {
+      get: function () {
+        return require('../deprecations')
+      }
     }
   })
 }

From d627ead273dbaf651850985447f4bbac006457e8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 10:17:52 -0700
Subject: [PATCH 028/510] Remove linter errors

---
 lib/browser/api/app.js           | 2 +-
 lib/common/api/crash-reporter.js | 1 -
 lib/common/init.js               | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index f8a4d3e2913e..025b6275fd36 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const electron = require('electron')
-const {session, Menu} = electron
+const {Menu} = electron
 const EventEmitter = require('events').EventEmitter
 
 const bindings = process.atomBinding('app')
diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js
index e62c7cdf95f9..21e352e7e510 100644
--- a/lib/common/api/crash-reporter.js
+++ b/lib/common/api/crash-reporter.js
@@ -48,7 +48,6 @@ var CrashReporter = (function () {
     }
     if (submitURL == null) {
       throw new Error('submitURL is a required option to crashReporter.start')
-      return
     }
     start = () => {
       binding.start(this.productName, companyName, submitURL, autoSubmit, ignoreSystemCrashHandler, extra)
diff --git a/lib/common/init.js b/lib/common/init.js
index 1b90b9343441..257249f0a639 100644
--- a/lib/common/init.js
+++ b/lib/common/init.js
@@ -1,6 +1,4 @@
-const path = require('path')
 const timers = require('timers')
-const Module = require('module')
 
 process.atomBinding = function (name) {
   try {

From 814ae7b4a4ddca8d7257326f40ebe3421549300a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 10:21:58 -0700
Subject: [PATCH 029/510] :art:

---
 lib/browser/api/auto-updater.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/browser/api/auto-updater.js b/lib/browser/api/auto-updater.js
index f99d3218e430..f838a26f2cea 100644
--- a/lib/browser/api/auto-updater.js
+++ b/lib/browser/api/auto-updater.js
@@ -1,2 +1,5 @@
-const autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native')
-module.exports = autoUpdater
+if (process.platform === 'win32') {
+  module.exports = require('./auto-updater/auto-updater-win')
+} else {
+  module.exports = require('./auto-updater/auto-updater-native')
+}

From 30b60516feb857fbf37174ffc110cf0dd2163b36 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 11:07:34 -0700
Subject: [PATCH 030/510] Initialize session explicitly

---
 lib/browser/api/app.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 025b6275fd36..1a989dc35861 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,9 +1,11 @@
 'use strict'
 
-const electron = require('electron')
-const {Menu} = electron
+const {Menu} = require('electron')
 const EventEmitter = require('events').EventEmitter
 
+// Initialize session
+require('electron').session
+
 const bindings = process.atomBinding('app')
 const downloadItemBindings = process.atomBinding('download_item')
 const app = bindings.app

From 722a07de86d32807dd0968ff0cf0b7bb93f88d97 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 11:15:39 -0700
Subject: [PATCH 031/510] Add explicit call to deprecate.log

---
 spec/api-deprecations-spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/api-deprecations-spec.js b/spec/api-deprecations-spec.js
index 375de5895fee..4d78856ebae5 100644
--- a/spec/api-deprecations-spec.js
+++ b/spec/api-deprecations-spec.js
@@ -14,9 +14,9 @@ describe('deprecations', function () {
       messages.push(message)
     })
 
-    require('electron').webFrame.registerUrlSchemeAsSecure('some-scheme')
+    require('electron').deprecate.log('this is deprecated')
 
-    assert.deepEqual(messages, ['registerUrlSchemeAsSecure is deprecated. Use registerURLSchemeAsSecure instead.'])
+    assert.deepEqual(messages, ['this is deprecated'])
   })
 
   it('throws an exception if no deprecation handler is specified', function () {

From 0eefb282ca8a8eddacca6c55c77d1abd51cdb2b2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 11:17:03 -0700
Subject: [PATCH 032/510] Test no handler via call to deprecate.log

---
 spec/api-deprecations-spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/api-deprecations-spec.js b/spec/api-deprecations-spec.js
index 4d78856ebae5..5b618ac90165 100644
--- a/spec/api-deprecations-spec.js
+++ b/spec/api-deprecations-spec.js
@@ -21,7 +21,7 @@ describe('deprecations', function () {
 
   it('throws an exception if no deprecation handler is specified', function () {
     assert.throws(function () {
-      require('electron').webFrame.registerUrlSchemeAsPrivileged('some-scheme')
-    }, 'registerUrlSchemeAsPrivileged is deprecated. Use registerURLSchemeAsPrivileged instead.')
+      require('electron').deprecate.log('this is deprecated')
+    }, /this is deprecated/)
   })
 })

From 4d6b95aa525f075c4548fb48768b36af1eeb62f3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 11:21:52 -0700
Subject: [PATCH 033/510] Tweak spec description

---
 spec/api-app-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js
index d631d9ae830c..b78700fae9ee 100644
--- a/spec/api-app-spec.js
+++ b/spec/api-app-spec.js
@@ -9,7 +9,7 @@ const app = remote.require('electron').app
 const BrowserWindow = remote.require('electron').BrowserWindow
 
 describe('electron module', function () {
-  it('prevents exposing internal modules to require', function () {
+  it('does not expose internal modules to require', function () {
     assert.throws(function () {
       require('clipboard')
     }, /Cannot find module 'clipboard'/)

From 609f5dcaaf8f1c265f3a727b354d4fe25bcc0d81 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 28 Apr 2016 11:31:00 -0700
Subject: [PATCH 034/510] Update read path to something that exists

---
 spec/asar-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/asar-spec.js b/spec/asar-spec.js
index a0cb7b4aabd2..f9c4e98ae8fa 100644
--- a/spec/asar-spec.js
+++ b/spec/asar-spec.js
@@ -17,7 +17,7 @@ describe('asar package', function () {
       it('does not leak fd', function () {
         var readCalls = 1
         while (readCalls <= 10000) {
-          fs.readFileSync(path.join(process.resourcesPath, 'electron.asar', 'renderer', 'api', 'ipc.js'))
+          fs.readFileSync(path.join(process.resourcesPath, 'electron.asar', 'renderer', 'api', 'ipc-renderer.js'))
           readCalls++
         }
       })

From 14661819c25efee1d343bf9ac0c8a8037658d255 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Mon, 2 May 2016 13:15:57 +0530
Subject: [PATCH 035/510] move session wrapper to webcontents

---
 lib/browser/api/app.js          | 3 ---
 lib/browser/api/session.js      | 8 --------
 lib/browser/api/web-contents.js | 7 +++++++
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 1a989dc35861..6ddac05efa99 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -3,9 +3,6 @@
 const {Menu} = require('electron')
 const EventEmitter = require('events').EventEmitter
 
-// Initialize session
-require('electron').session
-
 const bindings = process.atomBinding('app')
 const downloadItemBindings = process.atomBinding('download_item')
 const app = bindings.app
diff --git a/lib/browser/api/session.js b/lib/browser/api/session.js
index 47e00bd0462f..9c42f3645603 100644
--- a/lib/browser/api/session.js
+++ b/lib/browser/api/session.js
@@ -1,4 +1,3 @@
-const EventEmitter = require('events').EventEmitter
 const bindings = process.atomBinding('session')
 const PERSIST_PREFIX = 'persist:'
 
@@ -24,10 +23,3 @@ Object.defineProperty(exports, 'defaultSession', {
     return bindings.fromPartition('', false)
   }
 })
-
-var wrapSession = function (session) {
-  // session is an EventEmitter.
-  Object.setPrototypeOf(session, EventEmitter.prototype)
-}
-
-bindings._setWrapSession(wrapSession)
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 0ccb51b19b09..c706954b64bd 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -7,6 +7,7 @@ const Menu = require('electron').Menu
 
 const binding = process.atomBinding('web_contents')
 const debuggerBinding = process.atomBinding('debugger')
+const sessionBinding = process.atomBinding('session')
 
 let nextId = 0
 
@@ -211,8 +212,14 @@ let wrapDebugger = function (webContentsDebugger) {
   Object.setPrototypeOf(webContentsDebugger, EventEmitter.prototype)
 }
 
+var wrapSession = function (session) {
+  // session is an EventEmitter.
+  Object.setPrototypeOf(session, EventEmitter.prototype)
+}
+
 binding._setWrapWebContents(wrapWebContents)
 debuggerBinding._setWrapDebugger(wrapDebugger)
+sessionBinding._setWrapSession(wrapSession)
 
 module.exports.create = function (options) {
   if (options == null) {

From f2d8eadf4e654a42f20bdbd569d9f399a21332cf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 2 May 2016 09:31:42 -0700
Subject: [PATCH 036/510] Remove deprecated prototol APIs

---
 lib/browser/api/protocol.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/lib/browser/api/protocol.js b/lib/browser/api/protocol.js
index dac679f43e44..8e89055b73ad 100644
--- a/lib/browser/api/protocol.js
+++ b/lib/browser/api/protocol.js
@@ -4,28 +4,4 @@ if (!app.isReady()) {
   throw new Error('Can not initialize protocol module before app is ready')
 }
 
-const protocol = process.atomBinding('protocol').protocol
-
-// Warn about removed APIs.
-var logAndThrow = function (callback, message) {
-  console.error(message)
-  if (callback) {
-    return callback(new Error(message))
-  } else {
-    throw new Error(message)
-  }
-}
-
-protocol.registerProtocol = function (scheme, handler, callback) {
-  return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
-}
-
-protocol.isHandledProtocol = function (scheme, callback) {
-  return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.')
-}
-
-protocol.interceptProtocol = function (scheme, handler, callback) {
-  return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
-}
-
-module.exports = protocol
+module.exports = process.atomBinding('protocol').protocol

From 56cd57872cd5f6f7198b38201428845ae8b554ba Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 2 May 2016 09:32:52 -0700
Subject: [PATCH 037/510] Remove BrowserWindow events now on WebContents

---
 lib/browser/api/browser-window.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index e433580ba638..6da2fdadb46a 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -95,17 +95,6 @@ BrowserWindow.prototype._init = function () {
   // Notify the creation of the window.
   app.emit('browser-window-created', {}, this)
 
-  // Be compatible with old APIs.
-  this.webContents.on('devtools-focused', () => {
-    this.emit('devtools-focused')
-  })
-  this.webContents.on('devtools-opened', () => {
-    this.emit('devtools-opened')
-  })
-  this.webContents.on('devtools-closed', () => {
-    this.emit('devtools-closed')
-  })
-
   Object.defineProperty(this, 'devToolsWebContents', {
     enumerable: true,
     configurable: false,

From 76853801051be1dfbe94cb855567b5c901f9f12d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 2 May 2016 16:52:59 -0700
Subject: [PATCH 038/510] Remove crashed event forwarding

---
 lib/browser/api/browser-window.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index 6da2fdadb46a..1cfd84bebc56 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -43,11 +43,6 @@ BrowserWindow.prototype._init = function () {
     }
   })
 
-  // Forward the crashed event.
-  this.webContents.on('crashed', () => {
-    this.emit('crashed')
-  })
-
   // Change window title to page title.
   this.webContents.on('page-title-updated', (event, title) => {
     // The page-title-updated event is not emitted immediately (see #3645), so

From 446da677b56f19ce3e480652551ce293c5c45b52 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 3 May 2016 09:10:31 +0900
Subject: [PATCH 039/510] Remove NativeImage.toDataUrl

---
 atom/common/api/atom_api_native_image.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 1c90fe7080fb..e440f9c518bd 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -318,7 +318,6 @@ void NativeImage::BuildPrototype(
       .SetMethod("toJpeg", &NativeImage::ToJPEG)
       .SetMethod("getNativeHandle", &NativeImage::GetNativeHandle)
       .SetMethod("toDataURL", &NativeImage::ToDataURL)
-      .SetMethod("toDataUrl", &NativeImage::ToDataURL)  // deprecated.
       .SetMethod("isEmpty", &NativeImage::IsEmpty)
       .SetMethod("getSize", &NativeImage::GetSize)
       .SetMethod("setTemplateImage", &NativeImage::SetTemplateImage)

From fd432ddbc988fd489fc283e479ea9406dbd132db Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 3 May 2016 09:16:39 +0900
Subject: [PATCH 040/510] Fix the toDataUrl call in desktopCapturer

---
 lib/browser/desktop-capturer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/browser/desktop-capturer.js b/lib/browser/desktop-capturer.js
index 5e8ad3e7328c..21993a9fd71d 100644
--- a/lib/browser/desktop-capturer.js
+++ b/lib/browser/desktop-capturer.js
@@ -45,7 +45,7 @@ desktopCapturer.emit = function (event, name, sources) {
       results.push({
         id: source.id,
         name: source.name,
-        thumbnail: source.thumbnail.toDataUrl()
+        thumbnail: source.thumbnail.toDataURL()
       })
     }
     return results

From 28f1aef7b4ecae339ef2d59a959906217fd2255c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 4 May 2016 18:17:27 +0900
Subject: [PATCH 041/510] Remove ELECTRON_HIDE_INTERNAL_MODULES in docs

---
 docs/api/environment-variables.md |  4 ----
 docs/api/synopsis.md              | 19 -------------------
 2 files changed, 23 deletions(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index 7339661b09fe..e01afff5fa76 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -52,7 +52,3 @@ Don't attach to current console session.
 ## `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
 
 Don't use global menu bar on Linux.
-
-## `ELECTRON_HIDE_INTERNAL_MODULES`
-
-Turns off compatibility mode for old built-in modules like `require('ipc')`.
diff --git a/docs/api/synopsis.md b/docs/api/synopsis.md
index a2aa58f57f17..fc2ce943932c 100644
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -61,25 +61,6 @@ const {app, BrowserWindow} = require('electron')
 However if you are using plain JavaScript, you have to wait until Chrome fully
 supports ES6.
 
-## Disable old styles of using built-in modules
-
-Before v0.35.0, all built-in modules have to be used in the form of
-`require('module-name')`, though it has [many disadvantages][issue-387], we are
-still supporting it for compatibility with old apps.
-
-To disable the old styles completely, you can set the
-`ELECTRON_HIDE_INTERNAL_MODULES` environment variable:
-
-```javascript
-process.env.ELECTRON_HIDE_INTERNAL_MODULES = 'true'
-```
-
-Or call the `hideInternalModules` API:
-
-```javascript
-require('electron').hideInternalModules()
-```
-
 [gui]: https://en.wikipedia.org/wiki/Graphical_user_interface
 [destructuring-assignment]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment
 [issue-387]: https://github.com/electron/electron/issues/387

From ef459c7676ea0fe45c5e5caf34e35e4dd9f1a59f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 6 May 2016 09:06:03 -0700
Subject: [PATCH 042/510] Remove support for options now on webPreferences

---
 atom/browser/api/atom_api_window.cc | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index e2eb44ff48c5..aba453e50b9c 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -78,15 +78,6 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
   mate::Dictionary web_preferences = mate::Dictionary::CreateEmpty(isolate);
   options.Get(options::kWebPreferences, &web_preferences);
 
-  // Be compatible with old options which are now in web_preferences.
-  v8::Local<v8::Value> value;
-  if (options.Get(options::kNodeIntegration, &value))
-    web_preferences.Set(options::kNodeIntegration, value);
-  if (options.Get(options::kPreloadScript, &value))
-    web_preferences.Set(options::kPreloadScript, value);
-  if (options.Get(options::kZoomFactor, &value))
-    web_preferences.Set(options::kZoomFactor, value);
-
   // Copy the backgroundColor to webContents.
   if (options.Get(options::kBackgroundColor, &value))
     web_preferences.Set(options::kBackgroundColor, value);

From 6861d645ad45dad7525d70280a90bbb3c29c79f7 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 6 May 2016 13:25:01 -0700
Subject: [PATCH 043/510] Link to vendor folder on GitHub

---
 docs/development/source-code-directory-structure.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/development/source-code-directory-structure.md b/docs/development/source-code-directory-structure.md
index 27cf36b9d4e7..9e3cfee0b031 100644
--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -66,7 +66,7 @@ Electron
 ## Keeping Git Submodules Up to Date
 
 The Electron repository has a few vendored dependencies, found in the
-[/vendor](/vendor) directory. Occasionally you might see a message like this
+[/vendor][vendor] directory. Occasionally you might see a message like this
 when running `git status`:
 
 ```sh
@@ -89,3 +89,5 @@ in your `~/.gitconfig` file:
 [alias]
 	su = submodule update --init --recursive
 ```
+
+[vendor]: https://github.com/electron/electron/tree/master/vendor

From 53ac79cb19850005f64c2f42a42e8f62bb9b393f Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sat, 7 May 2016 04:32:54 +0530
Subject: [PATCH 044/510] devtools: handle file system indexing requests

---
 atom/browser/common_web_contents_delegate.cc | 123 ++++++++++++++++++-
 atom/browser/common_web_contents_delegate.h  |  30 +++++
 2 files changed, 150 insertions(+), 3 deletions(-)

diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index 4bebf7480b89..e17bcb9b2198 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -145,6 +145,13 @@ std::set<std::string> GetAddedFileSystemPaths(
   return result;
 }
 
+bool IsDevToolsFileSystemAdded(
+    content::WebContents* web_contents,
+    const std::string& file_system_path) {
+  auto file_system_paths = GetAddedFileSystemPaths(web_contents);
+  return file_system_paths.find(file_system_path) != file_system_paths.end();
+}
+
 content::SecurityStyle SecurityLevelToSecurityStyle(
     SecurityStateModel::SecurityLevel security_level) {
   switch (security_level) {
@@ -167,7 +174,8 @@ content::SecurityStyle SecurityLevelToSecurityStyle(
 
 CommonWebContentsDelegate::CommonWebContentsDelegate()
     : html_fullscreen_(false),
-      native_fullscreen_(false) {
+      native_fullscreen_(false),
+      devtools_file_system_indexer_(new DevToolsFileSystemIndexer) {
 }
 
 CommonWebContentsDelegate::~CommonWebContentsDelegate() {
@@ -456,8 +464,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
 
   std::string file_system_id = RegisterFileSystem(GetDevToolsWebContents(),
                                                   path);
-  auto file_system_paths = GetAddedFileSystemPaths(GetDevToolsWebContents());
-  if (file_system_paths.find(path.AsUTF8Unsafe()) != file_system_paths.end())
+  if (IsDevToolsFileSystemAdded(GetDevToolsWebContents(), path.AsUTF8Unsafe()))
     return;
 
   FileSystem file_system = CreateFileSystemStruct(GetDevToolsWebContents(),
@@ -495,6 +502,61 @@ void CommonWebContentsDelegate::DevToolsRemoveFileSystem(
                                     nullptr, nullptr);
 }
 
+void CommonWebContentsDelegate::DevToolsIndexPath(
+    int request_id,
+    const std::string& file_system_path) {
+  if (!IsDevToolsFileSystemAdded(GetDevToolsWebContents(), file_system_path)) {
+    OnDevToolsIndexingDone(request_id, file_system_path);
+    return;
+  }
+  if (devtools_indexing_jobs_.count(request_id) != 0)
+    return;
+  devtools_indexing_jobs_[request_id] =
+      scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob>(
+          devtools_file_system_indexer_->IndexPath(
+              file_system_path,
+              base::Bind(
+                  &CommonWebContentsDelegate::OnDevToolsIndexingWorkCalculated,
+                  base::Unretained(this),
+                  request_id,
+                  file_system_path),
+              base::Bind(&CommonWebContentsDelegate::OnDevToolsIndexingWorked,
+                         base::Unretained(this),
+                         request_id,
+                         file_system_path),
+              base::Bind(&CommonWebContentsDelegate::OnDevToolsIndexingDone,
+                         base::Unretained(this),
+                         request_id,
+                         file_system_path)));
+}
+
+void CommonWebContentsDelegate::DevToolsStopIndexing(int request_id) {
+  auto it = devtools_indexing_jobs_.find(request_id);
+  if (it == devtools_indexing_jobs_.end())
+    return;
+  it->second->Stop();
+  devtools_indexing_jobs_.erase(it);
+}
+
+void CommonWebContentsDelegate::DevToolsSearchInPath(
+    int request_id,
+    const std::string& file_system_path,
+    const std::string& query) {
+  if (!IsDevToolsFileSystemAdded(GetDevToolsWebContents(), file_system_path)) {
+    OnDevToolsSearchCompleted(request_id,
+                              file_system_path,
+                              std::vector<std::string>());
+    return;
+  }
+  devtools_file_system_indexer_->SearchInPath(
+      file_system_path,
+      query,
+      base::Bind(&CommonWebContentsDelegate::OnDevToolsSearchCompleted,
+                 base::Unretained(this),
+                 request_id,
+                 file_system_path));
+}
+
 void CommonWebContentsDelegate::OnDevToolsSaveToFile(
     const std::string& url) {
   // Notify DevTools.
@@ -511,6 +573,61 @@ void CommonWebContentsDelegate::OnDevToolsAppendToFile(
       "DevToolsAPI.appendedToURL", &url_value, nullptr, nullptr);
 }
 
+void CommonWebContentsDelegate::OnDevToolsIndexingWorkCalculated(
+    int request_id,
+    const std::string& file_system_path,
+    int total_work) {
+  base::FundamentalValue request_id_value(request_id);
+  base::StringValue file_system_path_value(file_system_path);
+  base::FundamentalValue total_work_value(total_work);
+  web_contents_->CallClientFunction("DevToolsAPI.indexingTotalWorkCalculated",
+                                    &request_id_value,
+                                    &file_system_path_value,
+                                    &total_work_value);
+}
+
+void CommonWebContentsDelegate::OnDevToolsIndexingWorked(
+    int request_id,
+    const std::string& file_system_path,
+    int worked) {
+  base::FundamentalValue request_id_value(request_id);
+  base::StringValue file_system_path_value(file_system_path);
+  base::FundamentalValue worked_value(worked);
+  web_contents_->CallClientFunction("DevToolsAPI.indexingWorked",
+                                    &request_id_value,
+                                    &file_system_path_value,
+                                    &worked_value);
+}
+
+void CommonWebContentsDelegate::OnDevToolsIndexingDone(
+    int request_id,
+    const std::string& file_system_path) {
+  devtools_indexing_jobs_.erase(request_id);
+  base::FundamentalValue request_id_value(request_id);
+  base::StringValue file_system_path_value(file_system_path);
+  web_contents_->CallClientFunction("DevToolsAPI.indexingDone",
+                                    &request_id_value,
+                                    &file_system_path_value,
+                                    nullptr);
+}
+
+void CommonWebContentsDelegate::OnDevToolsSearchCompleted(
+    int request_id,
+    const std::string& file_system_path,
+    const std::vector<std::string>& file_paths) {
+  base::ListValue file_paths_value;
+  for (std::vector<std::string>::const_iterator it(file_paths.begin());
+       it != file_paths.end(); ++it) {
+    file_paths_value.AppendString(*it);
+  }
+  base::FundamentalValue request_id_value(request_id);
+  base::StringValue file_system_path_value(file_system_path);
+  web_contents_->CallClientFunction("DevToolsAPI.searchCompleted",
+                                    &request_id_value,
+                                    &file_system_path_value,
+                                    &file_paths_value);
+}
+
 #if defined(TOOLKIT_VIEWS)
 gfx::ImageSkia CommonWebContentsDelegate::GetDevToolsWindowIcon() {
   if (!owner_window())
diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index 699d00e18bce..dbd5ddeebd9c 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -12,8 +12,11 @@
 #include "brightray/browser/inspectable_web_contents_impl.h"
 #include "brightray/browser/inspectable_web_contents_delegate.h"
 #include "brightray/browser/inspectable_web_contents_view_delegate.h"
+#include "brightray/browser/devtools_file_system_indexer.h"
 #include "content/public/browser/web_contents_delegate.h"
 
+using brightray::DevToolsFileSystemIndexer;
+
 namespace atom {
 
 class AtomJavaScriptDialogManager;
@@ -90,6 +93,12 @@ class CommonWebContentsDelegate
   void DevToolsAddFileSystem(const base::FilePath& path) override;
   void DevToolsRemoveFileSystem(
       const base::FilePath& file_system_path) override;
+  void DevToolsIndexPath(int request_id,
+                         const std::string& file_system_path) override;
+  void DevToolsStopIndexing(int request_id) override;
+  void DevToolsSearchInPath(int request_id,
+                            const std::string& file_system_path,
+                            const std::string& query) override;
 
   // brightray::InspectableWebContentsViewDelegate:
 #if defined(TOOLKIT_VIEWS)
@@ -107,6 +116,19 @@ class CommonWebContentsDelegate
   // Callback for when DevToolsAppendToFile has completed.
   void OnDevToolsAppendToFile(const std::string& url);
 
+  //
+  void OnDevToolsIndexingWorkCalculated(int request_id,
+                                        const std::string& file_system_path,
+                                        int total_work);
+  void OnDevToolsIndexingWorked(int request_id,
+                                const std::string& file_system_path,
+                                int worked);
+  void OnDevToolsIndexingDone(int request_id,
+                              const std::string& file_system_path);
+  void OnDevToolsSearchCompleted(int request_id,
+                                 const std::string& file_system_path,
+                                 const std::vector<std::string>& file_paths);
+
   // Set fullscreen mode triggered by html api.
   void SetHtmlApiFullscreen(bool enter_fullscreen);
 
@@ -121,6 +143,7 @@ class CommonWebContentsDelegate
 
   scoped_ptr<WebDialogHelper> web_dialog_helper_;
   scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
+  scoped_refptr<DevToolsFileSystemIndexer> devtools_file_system_indexer_;
 
   // The stored InspectableWebContents object.
   // Notice that web_contents_ must be placed after dialog_manager_, so we can
@@ -132,6 +155,13 @@ class CommonWebContentsDelegate
   typedef std::map<std::string, base::FilePath> PathsMap;
   PathsMap saved_files_;
 
+  // Map id to index job, used for file system indexing requests from devtools.
+  typedef std::map<
+      int,
+      scoped_refptr<DevToolsFileSystemIndexer::FileSystemIndexingJob>>
+      DevToolsIndexingJobsMap;
+  DevToolsIndexingJobsMap devtools_indexing_jobs_;
+
   DISALLOW_COPY_AND_ASSIGN(CommonWebContentsDelegate);
 };
 

From bb32039fde834343481cd05ee2ea4b6d508e592a Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Sat, 7 May 2016 00:08:53 +0200
Subject: [PATCH 045/510] Add disableWindowFiltering to app manifest to enable
 enumeration of modern app windows in node modules

---
 atom/browser/resources/win/atom.manifest | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/atom/browser/resources/win/atom.manifest b/atom/browser/resources/win/atom.manifest
index 84970c717288..8103d7c6cbf7 100644
--- a/atom/browser/resources/win/atom.manifest
+++ b/atom/browser/resources/win/atom.manifest
@@ -30,4 +30,10 @@
     </security>
   </trustInfo>
 
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <disableWindowFiltering xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+
 </assembly>

From bc8689889ddca25ddc00bd70210a8dc18844d747 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Sat, 7 May 2016 01:16:13 +0200
Subject: [PATCH 046/510] Add dpiAware to app manifest instead of calling
 SetProcessDpiAwareness / SetProcessDPIAware

---
 atom/app/atom_main.cc                    | 46 ------------------------
 atom/browser/resources/win/atom.manifest |  1 +
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
index cbd0a85d5768..be5339a6e0c3 100644
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -51,46 +51,6 @@ bool IsRunAsNode() {
   return IsEnvSet(kRunAsNode) || IsEnvSet(kOldRunAsNode);
 }
 
-#if defined(OS_WIN)
-// Win8.1 supports monitor-specific DPI scaling.
-bool SetProcessDpiAwarenessWrapper(PROCESS_DPI_AWARENESS value) {
-  typedef HRESULT(WINAPI *SetProcessDpiAwarenessPtr)(PROCESS_DPI_AWARENESS);
-  SetProcessDpiAwarenessPtr set_process_dpi_awareness_func =
-      reinterpret_cast<SetProcessDpiAwarenessPtr>(
-          GetProcAddress(GetModuleHandleA("user32.dll"),
-                         "SetProcessDpiAwarenessInternal"));
-  if (set_process_dpi_awareness_func) {
-    HRESULT hr = set_process_dpi_awareness_func(value);
-    if (SUCCEEDED(hr)) {
-      VLOG(1) << "SetProcessDpiAwareness succeeded.";
-      return true;
-    } else if (hr == E_ACCESSDENIED) {
-      LOG(ERROR) << "Access denied error from SetProcessDpiAwareness. "
-          "Function called twice, or manifest was used.";
-    }
-  }
-  return false;
-}
-
-// This function works for Windows Vista through Win8. Win8.1 must use
-// SetProcessDpiAwareness[Wrapper].
-BOOL SetProcessDPIAwareWrapper() {
-  typedef BOOL(WINAPI *SetProcessDPIAwarePtr)(VOID);
-  SetProcessDPIAwarePtr set_process_dpi_aware_func =
-      reinterpret_cast<SetProcessDPIAwarePtr>(
-      GetProcAddress(GetModuleHandleA("user32.dll"),
-                      "SetProcessDPIAware"));
-  return set_process_dpi_aware_func &&
-    set_process_dpi_aware_func();
-}
-
-void EnableHighDPISupport() {
-  if (!SetProcessDpiAwarenessWrapper(PROCESS_SYSTEM_DPI_AWARE)) {
-    SetProcessDPIAwareWrapper();
-  }
-}
-#endif
-
 }  // namespace
 
 #if defined(OS_WIN)
@@ -154,12 +114,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   content::InitializeSandboxInfo(&sandbox_info);
   atom::AtomMainDelegate delegate;
 
-  // We don't want to set DPI awareness on pre-Win7 because we don't support
-  // DirectWrite there. GDI fonts are kerned very badly, so better to leave
-  // DPI-unaware and at effective 1.0. See also ShouldUseDirectWrite().
-  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-    EnableHighDPISupport();
-
   content::ContentMainParams params(&delegate);
   params.instance = instance;
   params.sandbox_info = &sandbox_info;
diff --git a/atom/browser/resources/win/atom.manifest b/atom/browser/resources/win/atom.manifest
index 8103d7c6cbf7..64c07ded17b0 100644
--- a/atom/browser/resources/win/atom.manifest
+++ b/atom/browser/resources/win/atom.manifest
@@ -32,6 +32,7 @@
 
   <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
       <disableWindowFiltering xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">true</disableWindowFiltering>
     </asmv3:windowsSettings>
   </asmv3:application>

From 767c2357080bda8c01dd62b47c4cf03d97eb8921 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 7 May 2016 10:38:41 +0900
Subject: [PATCH 047/510] Fix compilation error

---
 atom/browser/api/atom_api_window.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index aba453e50b9c..399b4d36d2ec 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -79,6 +79,7 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
   options.Get(options::kWebPreferences, &web_preferences);
 
   // Copy the backgroundColor to webContents.
+  v8::Local<v8::Value> value;
   if (options.Get(options::kBackgroundColor, &value))
     web_preferences.Set(options::kBackgroundColor, value);
 

From e6f4dd0f85d01102ec9fed3daa97a82344b9de6f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 7 May 2016 10:54:34 +0900
Subject: [PATCH 048/510] Update brightray for #5431

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index 9a5b443e4953..a370461f3420 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 9a5b443e4953fa51ddd0a8d4739e60edf0a666a3
+Subproject commit a370461f3420ec285838126da7e7efd6a3101640

From 02e8e929e1646dd37541274420515c7955d2d58a Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Fri, 6 May 2016 11:23:18 +0100
Subject: [PATCH 049/510] :memo: Add Security Tutorial

Add basic information about Electron and Security, including an
invitation to contribute to security features. Contains information by
@zcbenz, @zeke, and @paulcbetts.
---
 docs/README.md            |  1 +
 docs/faq/electron-faq.md  |  7 +++++--
 docs/tutorial/security.md | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 docs/tutorial/security.md

diff --git a/docs/README.md b/docs/README.md
index c8bd425d9759..997499329b6c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -17,6 +17,7 @@ an issue:
 ## Guides
 
 * [Supported Platforms](tutorial/supported-platforms.md)
+* [Security](tutorial/security.md)
 * [Application Distribution](tutorial/application-distribution.md)
 * [Mac App Store Submission Guide](tutorial/mac-app-store-submission-guide.md)
 * [Application Packaging](tutorial/application-packaging.md)
diff --git a/docs/faq/electron-faq.md b/docs/faq/electron-faq.md
index 02d72744e657..d2659610ed48 100644
--- a/docs/faq/electron-faq.md
+++ b/docs/faq/electron-faq.md
@@ -3,11 +3,14 @@
 ## When will Electron upgrade to latest Chrome?
 
 The Chrome version of Electron is usually bumped within one or two weeks after
-a new stable Chrome version gets released.
+a new stable Chrome version gets released. This estimate is not guaranteed and
+depends on the amount of work involved with upgrading.
 
-Also we only use stable channel of Chrome. If an important fix is in beta or dev
+Only the stable channel of Chrome is used. If an important fix is in beta or dev
 channel, we will back-port it.
 
+For more information, please see the [security introduction](../tutorial/electron-security.md).
+
 ## When will Electron upgrade to latest Node.js?
 
 When a new version of Node.js gets released, we usually wait for about a month
diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
new file mode 100644
index 000000000000..bdc21aeb3efb
--- /dev/null
+++ b/docs/tutorial/security.md
@@ -0,0 +1,35 @@
+# Security, Native Capabilities, and Your Responsibility
+
+As web developers, we usually enjoy the strong security net of the browser - the risks associated with the code we write is relatively small. We rely on the fairly limited amount of power and capabilities granted to a website – and trust that our users enjoy a browser built by a large team of engineers that is able to quickly respond to newly discovered security threats.
+
+When working with Electron, it is important to understand that Electron is not a web browser. It allows you to build powerful desktop apps with web technologies. Its core feature is the ability to build software is just as powerful as completely native applications, eclipsing the limited feature set of a website. The inherent risks scale with the additional powers granted to your code.
+
+With that in mind, be aware that displaying arbitrary content from untrusted sources poses a severe security risk that Electron is not built to handle. In fact, the most popular Electron apps (Atom, Slack, Visual Studio Code, etc) display primarily local content (or trusted, secure remote content without Node integration) – if your application executes code from an online source, it is your responsibility to ensure that the code is not malicious.
+
+## Chromium Security Issues and Upgrades
+
+While Electron strives to support new versions of Chromium as soon as possible, developers should be aware that upgrading is a serious undertaking - involving hand-editing dozens or even hundreds of files. Given the resources and contributions available today, Electron will often not be on the very latest version of Chromium, lagging behind by either days or weeks.
+
+We feel that our current system of updating the Chromium component strikes an appropriate balance between the resources we have available and the needs of the majority of applications built on top of the framework. We definitely are interested in hearing more about specific use cases from the people that build things on top of Electron. Pull requests and contributions supporting this effort are always very welcome.
+
+## Ignoring Above Advice
+A security issue exists whenever you receive code from a remote destination and execute it locally. As an example, consider a remote website being displayed inside a browser window. If an attacker somehow manages to change said content (either by attacking the source directly, or by sitting between your app and the actual destination), they will be able to execute native code on the user's machine.
+
+> :warning: Under no circumstances should you load and execute remote code with enabled Node integration. Instead, use only local files (packaged together with your application) to execute Node code. To display remote content, use the `webview` tag and make sure to disable the `nodeIntegration`.
+
+#### Checklist
+This is not bulletproof, but at the least, you should attempt the following:
+
+ * Only display secure (https) content
+ * Disable the Node integration in all renderers that display remote content (using `webPreferences`)
+ * Do not disable `webSecurity`. Disabling it will disable the same-origin policy.
+ * Do not set `allowDisplayingInsecureContent` to true.
+ * Do not set `allowRunningInsecureContent` to true.
+ * Do not enable `experimentalFeatures` or `experimentalCanvasFeatures` unless you know what you're doing.
+ * Do not use `blinkFeatures` unless you know what you're doing.
+ * WebViews: Set `nodeintegration` to false 
+ * WebViews: Do not use `disablewebsecurity`
+ * WebViews: Do not use `allowpopups`
+ * WebViews: Do not use `insertCSS` or `executeJavaScript` with remote CSS/JS.
+ 
+Again, this list merely minimizes the risk, it does not remove it. If your goal is to display a website, a browser will be a more secure option. 

From b6fd4fed389ec643363b84a863ddd73502bf0963 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Fri, 6 May 2016 17:53:50 -0600
Subject: [PATCH 050/510] :lipstick: Update default_app to ES6 conventions

Add space before object literal method
---
 default_app/default_app.js | 10 +++----
 default_app/index.html     |  4 +--
 default_app/main.js        | 56 ++++++++++++++++++--------------------
 3 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/default_app/default_app.js b/default_app/default_app.js
index 5f5b2c800316..a72675ea6fdc 100644
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
@@ -1,16 +1,14 @@
-const electron = require('electron')
-const app = electron.app
-const BrowserWindow = electron.BrowserWindow
+const {app, BrowserWindow} = require('electron')
 
 var mainWindow = null
 
 // Quit when all windows are closed.
-app.on('window-all-closed', function () {
+app.on('window-all-closed', () => {
   app.quit()
 })
 
-exports.load = function (appUrl) {
-  app.on('ready', function () {
+exports.load = (appUrl) => {
+  app.on('ready', () => {
     mainWindow = new BrowserWindow({
       width: 800,
       height: 600,
diff --git a/default_app/index.html b/default_app/index.html
index c10d67a089ac..21fbf93cc30e 100644
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -113,9 +113,7 @@
 </head>
 <body>
   <script>
-    const electron = require('electron');
-    const remote = electron.remote;
-    const shell = electron.shell;
+    const {remote, shell} = require('electron');
 
     var execPath = remote.process.execPath;
     var command = execPath + ' path-to-your-app';
diff --git a/default_app/main.js b/default_app/main.js
index 2bc1ac7743ae..8eaae8e65f38 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -1,8 +1,4 @@
-const electron = require('electron')
-const app = electron.app
-const dialog = electron.dialog
-const shell = electron.shell
-const Menu = electron.Menu
+const {app, dialog, shell, Menu} = require('electron')
 
 const fs = require('fs')
 const path = require('path')
@@ -10,9 +6,9 @@ const repl = require('repl')
 const url = require('url')
 
 // Parse command line options.
-var argv = process.argv.slice(1)
-var option = { file: null, help: null, version: null, webdriver: null, modules: [] }
-for (var i = 0; i < argv.length; i++) {
+const argv = process.argv.slice(1)
+const option = { file: null, help: null, version: null, webdriver: null, modules: [] }
+for (let i = 0; i < argv.length; i++) {
   if (argv[i] === '--version' || argv[i] === '-v') {
     option.version = true
     break
@@ -38,17 +34,17 @@ for (var i = 0; i < argv.length; i++) {
 }
 
 // Quit when all windows are closed and no other one is listening to this.
-app.on('window-all-closed', function () {
+app.on('window-all-closed', () => {
   if (app.listeners('window-all-closed').length === 1 && !option.interactive) {
     app.quit()
   }
 })
 
 // Create default menu.
-app.once('ready', function () {
+app.once('ready', () => {
   if (Menu.getApplicationMenu()) return
 
-  var template = [
+  const template = [
     {
       label: 'Edit',
       submenu: [
@@ -93,25 +89,25 @@ app.once('ready', function () {
         {
           label: 'Reload',
           accelerator: 'CmdOrCtrl+R',
-          click: function (item, focusedWindow) {
+          click (item, focusedWindow) {
             if (focusedWindow) focusedWindow.reload()
           }
         },
         {
           label: 'Toggle Full Screen',
-          accelerator: (function () {
+          accelerator: (() => {
             return (process.platform === 'darwin') ? 'Ctrl+Command+F' : 'F11'
           })(),
-          click: function (item, focusedWindow) {
+          click (item, focusedWindow) {
             if (focusedWindow) focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
           }
         },
         {
           label: 'Toggle Developer Tools',
-          accelerator: (function () {
+          accelerator: (() => {
             return (process.platform === 'darwin') ? 'Alt+Command+I' : 'Ctrl+Shift+I'
           })(),
-          click: function (item, focusedWindow) {
+          click (item, focusedWindow) {
             if (focusedWindow) focusedWindow.toggleDevTools()
           }
         }
@@ -139,13 +135,13 @@ app.once('ready', function () {
       submenu: [
         {
           label: 'Learn More',
-          click: function () {
+          click () {
             shell.openExternal('http://electron.atom.io')
           }
         },
         {
           label: 'Documentation',
-          click: function () {
+          click () {
             shell.openExternal(
               `https://github.com/electron/electron/tree/v${process.versions.electron}/docs#readme`
             )
@@ -153,13 +149,13 @@ app.once('ready', function () {
         },
         {
           label: 'Community Discussions',
-          click: function () {
+          click () {
             shell.openExternal('https://discuss.atom.io/c/electron')
           }
         },
         {
           label: 'Search Issues',
-          click: function () {
+          click () {
             shell.openExternal('https://github.com/electron/electron/issues')
           }
         }
@@ -206,7 +202,7 @@ app.once('ready', function () {
         {
           label: 'Quit',
           accelerator: 'Command+Q',
-          click: function () { app.quit() }
+          click () { app.quit() }
         }
       ]
     })
@@ -221,7 +217,7 @@ app.once('ready', function () {
     )
   }
 
-  var menu = Menu.buildFromTemplate(template)
+  const menu = Menu.buildFromTemplate(template)
   Menu.setApplicationMenu(menu)
 })
 
@@ -236,9 +232,9 @@ function loadApplicationPackage (packagePath) {
   try {
     // Override app name and version.
     packagePath = path.resolve(packagePath)
-    var packageJsonPath = path.join(packagePath, 'package.json')
+    const packageJsonPath = path.join(packagePath, 'package.json')
     if (fs.existsSync(packageJsonPath)) {
-      var packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
+      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
       if (packageJson.version) app.setVersion(packageJson.version)
 
       if (packageJson.productName) {
@@ -277,7 +273,7 @@ function loadApplicationByUrl (appUrl) {
 }
 
 function startRepl () {
-  repl.start('> ').on('exit', function () {
+  repl.start('> ').on('exit', () => {
     process.exit(0)
   })
 }
@@ -285,9 +281,9 @@ function startRepl () {
 // Start the specified app if there is one specified in command line, otherwise
 // start the default app.
 if (option.file && !option.webdriver) {
-  var file = option.file
-  var protocol = url.parse(file).protocol
-  var extension = path.extname(file)
+  const file = option.file
+  const protocol = url.parse(file).protocol
+  const extension = path.extname(file)
   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:') {
     loadApplicationByUrl(file)
   } else if (extension === '.html' || extension === '.htm') {
@@ -299,7 +295,7 @@ if (option.file && !option.webdriver) {
   console.log('v' + process.versions.electron)
   process.exit(0)
 } else if (option.help) {
-  var helpMessage = `Electron v${process.versions.electron} - Cross Platform Desktop Application Shell
+  const helpMessage = `Electron v${process.versions.electron} - Cross Platform Desktop Application Shell
 
   Usage: electron [options] [path]
 
@@ -322,6 +318,6 @@ if (option.file && !option.webdriver) {
 } else if (option.interactive) {
   startRepl()
 } else {
-  var indexPath = path.join(__dirname, '/index.html')
+  const indexPath = path.join(__dirname, '/index.html')
   loadApplicationByUrl(`file://${indexPath}`)
 }

From 6708e2a3028b6b8810539a88554df799e2108008 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 7 May 2016 08:52:52 -0600
Subject: [PATCH 051/510] :lipstick: Cache last argument in parseArgs

This is to eliminate the need to access the array twice.
---
 lib/browser/api/dialog.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
index 6669d8cab89a..3410618027fe 100644
--- a/lib/browser/api/dialog.js
+++ b/lib/browser/api/dialog.js
@@ -35,8 +35,9 @@ var parseArgs = function (window, options, callback, ...args) {
   }
 
   // Fallback to using very last argument as the callback function
-  if ((callback == null) && typeof args[args.length - 1] === 'function') {
-    callback = args[args.length - 1]
+  var lastArgument = args[args.length - 1]
+  if ((callback == null) && typeof lastArgument === 'function') {
+    callback = lastArgument
   }
 
   return [window, options, callback]

From f3e633eb2c8187e2fe346882794f38dcd692525d Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 7 May 2016 08:55:26 -0600
Subject: [PATCH 052/510] :lipstick: Use destructuring to shift arguments

---
 lib/browser/api/dialog.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
index 3410618027fe..9b43b7b936db 100644
--- a/lib/browser/api/dialog.js
+++ b/lib/browser/api/dialog.js
@@ -23,15 +23,12 @@ var messageBoxOptions = {
 var parseArgs = function (window, options, callback, ...args) {
   if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
     // Shift.
-    callback = options
-    options = window
-    window = null
+    [callback, options, window] = [options, window, null]
   }
 
   if ((callback == null) && typeof options === 'function') {
     // Shift.
-    callback = options
-    options = null
+    [callback, options] = [options, null]
   }
 
   // Fallback to using very last argument as the callback function

From 91220f2a98ec6b2a441b18786262372c9fba91bd Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 7 May 2016 09:13:40 -0600
Subject: [PATCH 053/510] :lipstick: Simplify conditional check for
 BrowserWindow

---
 lib/browser/api/dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
index 9b43b7b936db..a41d1fa46e0c 100644
--- a/lib/browser/api/dialog.js
+++ b/lib/browser/api/dialog.js
@@ -21,7 +21,7 @@ var messageBoxOptions = {
 }
 
 var parseArgs = function (window, options, callback, ...args) {
-  if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
+  if (window !== null && window.constructor !== BrowserWindow) {
     // Shift.
     [callback, options, window] = [options, window, null]
   }

From 19d5d3b7d185dd42521b062b135e14c08732d5f6 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Sat, 7 May 2016 11:07:58 -0700
Subject: [PATCH 054/510] Implement RemoveAsDefaultProtocolClient on OS X

---
 atom/browser/browser_mac.mm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index eb7191b67a23..767ddee590ec 100644
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -43,7 +43,28 @@ void Browser::ClearRecentDocuments() {
 }
 
 bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
-  return false;
+  NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
+  if (!identifier)
+    return false;
+
+  NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
+  CFStringRef protocol_cf = base::mac::NSToCFCast(protocol_ns);
+  CFArrayRef bundleList = LSCopyAllHandlersForURLScheme(protocol_cf);
+  if (!bundleList) {
+    return false;
+  }
+  // On Mac OS X, we can't query the default, but the handlers list seems to put
+  // Apple's defaults first, so we'll use the first option that isn't our bundle
+  CFStringRef other = nil;
+  for (CFIndex i = 0; i < CFArrayGetCount(bundleList); i++) {
+    other = (CFStringRef)CFArrayGetValueAtIndex(bundleList, i);
+    if (![identifier isEqualToString: (__bridge NSString *)other]) {
+      break;
+    }
+  }
+
+  OSStatus return_code = LSSetDefaultHandlerForURLScheme(protocol_cf, other);
+  return return_code == noErr;
 }
 
 bool Browser::SetAsDefaultProtocolClient(const std::string& protocol) {

From 1ff33b7c81f61429c1e0bac5d32458dd3129cae1 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Fri, 6 May 2016 00:04:16 +0530
Subject: [PATCH 055/510] protocol: fix registerStandardSchemes api

---
 atom/app/atom_content_client.cc       |  7 ---
 atom/browser/api/atom_api_protocol.cc |  4 +-
 atom/browser/atom_browser_client.cc   | 12 ----
 atom/browser/atom_browser_client.h    |  3 +-
 atom/common/options_switches.cc       |  3 -
 atom/common/options_switches.h        |  1 -
 spec/api-protocol-spec.js             | 80 ++++++++++++++++++++++++++-
 spec/fixtures/pages/b.html            |  2 +-
 8 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index 25e9d0f1932a..8f59c77768c6 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -183,13 +183,6 @@ base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
 void AtomContentClient::AddAdditionalSchemes(
     std::vector<url::SchemeWithType>* standard_schemes,
     std::vector<std::string>* savable_schemes) {
-  std::vector<std::string> schemes;
-  ConvertStringWithSeparatorToVector(&schemes, ",",
-                                     switches::kRegisterStandardSchemes);
-  if (!schemes.empty()) {
-    for (const std::string& scheme : schemes)
-      standard_schemes->push_back({scheme.c_str(), url::SCHEME_WITHOUT_PORT});
-  }
   standard_schemes->push_back({"chrome-extension", url::SCHEME_WITHOUT_PORT});
 }
 
diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
index 3835fac62d7a..115a3c58ad41 100644
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -15,6 +15,7 @@
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
+#include "url/url_util.h"
 
 using content::BrowserThread;
 
@@ -31,7 +32,8 @@ Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
 
 void Protocol::RegisterStandardSchemes(
     const std::vector<std::string>& schemes) {
-  atom::AtomBrowserClient::SetCustomSchemes(schemes);
+  for (const auto& scheme : schemes)
+    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
 }
 
 void Protocol::RegisterServiceWorkerSchemes(
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index f4add58e3a89..8ecd37a6bca4 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -49,8 +49,6 @@ namespace {
 // Next navigation should not restart renderer process.
 bool g_suppress_renderer_process_restart = false;
 
-// Custom schemes to be registered to standard.
-std::string g_custom_schemes = "";
 // Custom schemes to be registered to handle service worker.
 std::string g_custom_service_worker_schemes = "";
 
@@ -61,11 +59,6 @@ void AtomBrowserClient::SuppressRendererProcessRestartForOnce() {
   g_suppress_renderer_process_restart = true;
 }
 
-void AtomBrowserClient::SetCustomSchemes(
-    const std::vector<std::string>& schemes) {
-  g_custom_schemes = base::JoinString(schemes, ",");
-}
-
 void AtomBrowserClient::SetCustomServiceWorkerSchemes(
     const std::vector<std::string>& schemes) {
   g_custom_service_worker_schemes = base::JoinString(schemes, ",");
@@ -153,11 +146,6 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
   if (process_type != "renderer")
     return;
 
-  // The registered standard schemes.
-  if (!g_custom_schemes.empty())
-    command_line->AppendSwitchASCII(switches::kRegisterStandardSchemes,
-                                    g_custom_schemes);
-
   // The registered service worker schemes.
   if (!g_custom_service_worker_schemes.empty())
     command_line->AppendSwitchASCII(switches::kRegisterServiceWorkerSchemes,
diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h
index 5354e14cc617..ef5fd5a43300 100644
--- a/atom/browser/atom_browser_client.h
+++ b/atom/browser/atom_browser_client.h
@@ -36,8 +36,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
 
   // Don't force renderer process to restart for once.
   static void SuppressRendererProcessRestartForOnce();
-  // Custom schemes to be registered to standard.
-  static void SetCustomSchemes(const std::vector<std::string>& schemes);
+
   // Custom schemes to be registered to handle service worker.
   static void SetCustomServiceWorkerSchemes(
       const std::vector<std::string>& schemes);
diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index 166942db962c..de130eee13eb 100644
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -125,9 +125,6 @@ const char kPpapiFlashVersion[] = "ppapi-flash-version";
 // Disable HTTP cache.
 const char kDisableHttpCache[] = "disable-http-cache";
 
-// Register schemes to standard.
-const char kRegisterStandardSchemes[] = "register-standard-schemes";
-
 // Register schemes to handle service worker.
 const char kRegisterServiceWorkerSchemes[] = "register-service-worker-schemes";
 
diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index 653f35a812bf..fadde79f18c8 100644
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -70,7 +70,6 @@ extern const char kEnablePlugins[];
 extern const char kPpapiFlashPath[];
 extern const char kPpapiFlashVersion[];
 extern const char kDisableHttpCache[];
-extern const char kRegisterStandardSchemes[];
 extern const char kRegisterServiceWorkerSchemes[];
 extern const char kSSLVersionFallbackMin[];
 extern const char kCipherSuiteBlacklist[];
diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
index 9f2a25eb4a54..c84d5be25a06 100644
--- a/spec/api-protocol-spec.js
+++ b/spec/api-protocol-spec.js
@@ -3,6 +3,7 @@ const http = require('http')
 const path = require('path')
 const qs = require('querystring')
 const remote = require('electron').remote
+const BrowserWindow = remote.require('electron').BrowserWindow
 const protocol = remote.require('electron').protocol
 
 describe('protocol module', function () {
@@ -344,6 +345,7 @@ describe('protocol module', function () {
         })
       })
     })
+
     it('sends object as response', function (done) {
       var handler = function (request, callback) {
         callback({
@@ -394,7 +396,7 @@ describe('protocol module', function () {
       var handler = function (request, callback) {
         callback(fakeFilePath)
       }
-      protocol.registerBufferProtocol(protocolName, handler, function (error) {
+      protocol.registerFileProtocol(protocolName, handler, function (error) {
         if (error) {
           return done(error)
         }
@@ -415,7 +417,7 @@ describe('protocol module', function () {
       var handler = function (request, callback) {
         callback(new Date())
       }
-      protocol.registerBufferProtocol(protocolName, handler, function (error) {
+      protocol.registerFileProtocol(protocolName, handler, function (error) {
         if (error) {
           return done(error)
         }
@@ -814,4 +816,78 @@ describe('protocol module', function () {
       })
     })
   })
+
+  describe('protocol.registerStandardSchemes', function () {
+    const standardScheme = 'app'
+    const origin = standardScheme + '://fake-host'
+    const imageURL = origin + '/test.png'
+    const filePath = path.join(__dirname, 'fixtures', 'pages', 'b.html')
+    const fileContent = '<img src="/test.png" />'
+    var w = null
+    var success = null
+
+    before(function () {
+      protocol.registerStandardSchemes([standardScheme])
+    })
+
+    beforeEach(function () {
+      w = new BrowserWindow({show: false})
+      success = false
+    })
+
+    afterEach(function (done) {
+      protocol.unregisterProtocol(standardScheme, function () {
+        if (w != null) {
+          w.destroy()
+        }
+        w = null
+        done()
+      })
+    })
+
+    it('resolves relative resources', function (done) {
+      var handler = function (request, callback) {
+        if (request.url === imageURL) {
+          success = true
+          callback()
+        } else {
+          callback(filePath)
+        }
+      }
+      protocol.registerFileProtocol(standardScheme, handler, function (error) {
+        if (error) {
+          return done(error)
+        }
+        w.webContents.on('did-finish-load', function () {
+          assert(success)
+          done()
+        })
+        w.loadURL(origin)
+      })
+    })
+
+    it('resolves absolute resources', function (done) {
+      var handler = function (request, callback) {
+        if (request.url === imageURL) {
+          success = true
+          callback()
+        } else {
+          callback({
+            data: fileContent,
+            mimeType: 'text/html'
+          })
+        }
+      }
+      protocol.registerStringProtocol(standardScheme, handler, function (error) {
+        if (error) {
+          return done(error)
+        }
+        w.webContents.on('did-finish-load', function () {
+          assert(success)
+          done()
+        })
+        w.loadURL(origin)
+      })
+    })
+  })
 })
diff --git a/spec/fixtures/pages/b.html b/spec/fixtures/pages/b.html
index 812431f2b45b..d35c863b42c5 100644
--- a/spec/fixtures/pages/b.html
+++ b/spec/fixtures/pages/b.html
@@ -1,8 +1,8 @@
 <html>
 <body>
+<img src="./test.png" />
 <script type="text/javascript" charset="utf-8">
   console.log('b');
 </script>
 </body>
 </html>
-

From 0f2ae385ed6379ddabfd6dab4b54b17c0efbac3d Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 8 May 2016 00:13:23 +0530
Subject: [PATCH 056/510] allow protocol module initialization before app
 ready.  * ensure registerStandardSchemes can only be called before app ready 
 * ensure other protocol methods can only be used after app ready

---
 atom/browser/api/atom_api_protocol.cc | 53 ++++++++++++++++++++++-----
 atom/browser/api/atom_api_protocol.h  | 21 +++++++++--
 lib/browser/api/protocol.js           |  6 ---
 spec/api-protocol-spec.js             |  6 +--
 spec/static/main.js                   |  5 +++
 5 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
index 115a3c58ad41..341baf2d1d1f 100644
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -7,6 +7,7 @@
 #include "atom/browser/atom_browser_client.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
+#include "atom/browser/browser.h"
 #include "atom/browser/net/url_request_async_asar_job.h"
 #include "atom/browser/net/url_request_buffer_job.h"
 #include "atom/browser/net/url_request_fetch_job.h"
@@ -23,15 +24,38 @@ namespace atom {
 
 namespace api {
 
-Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
-    : request_context_getter_(browser_context->GetRequestContext()),
-      job_factory_(browser_context->job_factory()) {
-  CHECK(job_factory_);
+Protocol::Protocol(v8::Isolate* isolate)
+    : request_context_getter_(nullptr),
+      job_factory_(nullptr) {
+  if (Browser::Get()->is_ready()) {
+    OnWillFinishLaunching();
+  } else {
+    Browser::Get()->AddObserver(this);
+  }
   Init(isolate);
 }
 
+Protocol::~Protocol() {
+  Browser::Get()->RemoveObserver(this);
+}
+
+void Protocol::OnWillFinishLaunching() {
+  auto browser_context = static_cast<atom::AtomBrowserContext*>(
+      atom::AtomBrowserMainParts::Get()->browser_context());
+  request_context_getter_ = browser_context->GetRequestContext();
+  job_factory_ = browser_context->job_factory();
+  CHECK(job_factory_);
+}
+
 void Protocol::RegisterStandardSchemes(
     const std::vector<std::string>& schemes) {
+  if (Browser::Get()->is_ready()) {
+    isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
+        isolate(),
+        "\"protocol.registerStandardSchemes\" should be called before"
+        "app is ready")));
+    return;
+  }
   for (const auto& scheme : schemes)
     url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
 }
@@ -45,6 +69,10 @@ void Protocol::UnregisterProtocol(
     const std::string& scheme, mate::Arguments* args) {
   CompletionCallback callback;
   args->GetNext(&callback);
+  if (!job_factory_) {
+    OnIOCompleted(callback, PROTOCOL_FAIL);
+    return;
+  }
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&Protocol::UnregisterProtocolInIO,
@@ -63,6 +91,10 @@ Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
 
 void Protocol::IsProtocolHandled(const std::string& scheme,
                                     const BooleanCallback& callback) {
+  if (!job_factory_) {
+    callback.Run(false);
+    return;
+  }
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&Protocol::IsProtocolHandledInIO,
@@ -78,6 +110,10 @@ void Protocol::UninterceptProtocol(
     const std::string& scheme, mate::Arguments* args) {
   CompletionCallback callback;
   args->GetNext(&callback);
+  if (!job_factory_) {
+    OnIOCompleted(callback, PROTOCOL_FAIL);
+    return;
+  }
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&Protocol::UninterceptProtocolInIO,
@@ -124,9 +160,8 @@ std::string Protocol::ErrorCodeToString(ProtocolError error) {
 }
 
 // static
-mate::Handle<Protocol> Protocol::Create(
-    v8::Isolate* isolate, AtomBrowserContext* browser_context) {
-  return mate::CreateHandle(isolate, new Protocol(isolate, browser_context));
+mate::Handle<Protocol> Protocol::Create(v8::Isolate* isolate) {
+  return mate::CreateHandle(isolate, new Protocol(isolate));
 }
 
 // static
@@ -167,9 +202,7 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  auto browser_context = static_cast<atom::AtomBrowserContext*>(
-      atom::AtomBrowserMainParts::Get()->browser_context());
-  dict.Set("protocol", atom::api::Protocol::Create(isolate, browser_context));
+  dict.Set("protocol", atom::api::Protocol::Create(isolate));
 }
 
 }  // namespace
diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h
index d7fa7f5211f8..80b7006259a9 100644
--- a/atom/browser/api/atom_api_protocol.h
+++ b/atom/browser/api/atom_api_protocol.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <vector>
 
+#include "atom/browser/browser_observer.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ -30,21 +31,25 @@ class AtomURLRequestJobFactory;
 
 namespace api {
 
-class Protocol : public mate::Wrappable<Protocol> {
+class Protocol : public mate::Wrappable<Protocol>,
+                 public BrowserObserver {
  public:
   using Handler =
       base::Callback<void(const net::URLRequest*, v8::Local<v8::Value>)>;
   using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
   using BooleanCallback = base::Callback<void(bool)>;
 
-  static mate::Handle<Protocol> Create(
-      v8::Isolate* isolate, AtomBrowserContext* browser_context);
+  static mate::Handle<Protocol> Create(v8::Isolate* isolate);
 
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::ObjectTemplate> prototype);
 
  protected:
-  Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context);
+  explicit Protocol(v8::Isolate* isolate);
+  ~Protocol();
+
+  // BrowserObserver:
+  void OnWillFinishLaunching() override;
 
  private:
   // Possible errors.
@@ -101,6 +106,10 @@ class Protocol : public mate::Wrappable<Protocol> {
                         mate::Arguments* args) {
     CompletionCallback callback;
     args->GetNext(&callback);
+    if (!job_factory_) {
+      OnIOCompleted(callback, PROTOCOL_FAIL);
+      return;
+    }
     content::BrowserThread::PostTaskAndReplyWithResult(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&Protocol::RegisterProtocolInIO<RequestJob>,
@@ -138,6 +147,10 @@ class Protocol : public mate::Wrappable<Protocol> {
                          mate::Arguments* args) {
     CompletionCallback callback;
     args->GetNext(&callback);
+    if (!job_factory_) {
+      OnIOCompleted(callback, PROTOCOL_FAIL);
+      return;
+    }
     content::BrowserThread::PostTaskAndReplyWithResult(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&Protocol::InterceptProtocolInIO<RequestJob>,
diff --git a/lib/browser/api/protocol.js b/lib/browser/api/protocol.js
index dac679f43e44..3c7bed5d1cc5 100644
--- a/lib/browser/api/protocol.js
+++ b/lib/browser/api/protocol.js
@@ -1,9 +1,3 @@
-const app = require('electron').app
-
-if (!app.isReady()) {
-  throw new Error('Can not initialize protocol module before app is ready')
-}
-
 const protocol = process.atomBinding('protocol').protocol
 
 // Warn about removed APIs.
diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
index c84d5be25a06..2a1d158c3dfd 100644
--- a/spec/api-protocol-spec.js
+++ b/spec/api-protocol-spec.js
@@ -818,7 +818,7 @@ describe('protocol module', function () {
   })
 
   describe('protocol.registerStandardSchemes', function () {
-    const standardScheme = 'app'
+    const standardScheme = remote.getGlobal('standardScheme')
     const origin = standardScheme + '://fake-host'
     const imageURL = origin + '/test.png'
     const filePath = path.join(__dirname, 'fixtures', 'pages', 'b.html')
@@ -826,10 +826,6 @@ describe('protocol module', function () {
     var w = null
     var success = null
 
-    before(function () {
-      protocol.registerStandardSchemes([standardScheme])
-    })
-
     beforeEach(function () {
       w = new BrowserWindow({show: false})
       success = false
diff --git a/spec/static/main.js b/spec/static/main.js
index 025ff394bc66..33c3bb48136a 100644
--- a/spec/static/main.js
+++ b/spec/static/main.js
@@ -6,6 +6,7 @@ const app = electron.app
 const ipcMain = electron.ipcMain
 const dialog = electron.dialog
 const BrowserWindow = electron.BrowserWindow
+const protocol = electron.protocol
 
 const fs = require('fs')
 const path = require('path')
@@ -71,6 +72,10 @@ if (global.isCi) {
   })
 }
 
+// Register app as standard scheme.
+global.standardScheme = 'app'
+protocol.registerStandardSchemes([global.standardScheme])
+
 app.on('window-all-closed', function () {
   app.quit()
 })

From 9c71c9fa6abaa98e751d31e5d317cbe65e1fe533 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 8 May 2016 01:31:04 +0530
Subject: [PATCH 057/510] fix docs and spec

---
 atom/browser/api/atom_api_protocol.cc |  2 +-
 docs/api/protocol.md                  | 14 ++++++++------
 spec/api-protocol-spec.js             |  6 ++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
index 341baf2d1d1f..20667ffd3a04 100644
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -52,7 +52,7 @@ void Protocol::RegisterStandardSchemes(
   if (Browser::Get()->is_ready()) {
     isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
         isolate(),
-        "\"protocol.registerStandardSchemes\" should be called before"
+        "protocol.registerStandardSchemes should be called before"
         "app is ready")));
     return;
   }
diff --git a/docs/api/protocol.md b/docs/api/protocol.md
index 9474a4539a70..ab0bd7578894 100644
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -7,11 +7,10 @@ An example of implementing a protocol that has the same effect as the
 
 ```javascript
 const electron = require('electron');
-const { app } = electron;
+const { app, protocol } = electron;
 const path = require('path');
 
 app.on('ready', function() {
-    const { protocol } = electron;
     protocol.registerFileProtocol('atom', function(request, callback) {
       const url = request.url.substr(7);
       callback({path: path.normalize(__dirname + '/' + url)});
@@ -21,9 +20,8 @@ app.on('ready', function() {
     });
 });
 ```
-
-**Note:** This module can only be used after the `ready` event in the `app`
-module is emitted.
+**Note:** All methods unless specified can only be used after the `ready`
+event in the `app` module is emitted.
 
 ## Methods
 
@@ -35,7 +33,11 @@ The `protocol` module has the following methods:
 
 A standard `scheme` adheres to what RFC 3986 calls
 [generic URI syntax](https://tools.ietf.org/html/rfc3986#section-3). This
-includes `file:` and `filesystem:`.
+includes `file:`, `filesystem:`, `http` etc. Registering a scheme as standard, will
+allow relative and absolute resources to be resolved correctly when served.
+
+**Note:** This method can only be used before the `ready` event in the
+`app` module is emitted.
 
 ### `protocol.registerServiceWorkerSchemes(schemes)`
 
diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
index 2a1d158c3dfd..cfbbc6608e06 100644
--- a/spec/api-protocol-spec.js
+++ b/spec/api-protocol-spec.js
@@ -841,6 +841,12 @@ describe('protocol module', function () {
       })
     })
 
+    it('throws when called after ready event', function () {
+      assert.throws(function () {
+        protocol.registerStandardSchemes(['some-scheme'])
+      }, 'protocol.registerStandardSchemes should be called before app is ready')
+    })
+
     it('resolves relative resources', function (done) {
       var handler = function (request, callback) {
         if (request.url === imageURL) {

From e24ce97731668101378e5b951479579f0af3d494 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 8 May 2016 14:38:07 +0900
Subject: [PATCH 058/510] Set expirationDate for persistent cookie

---
 atom/browser/api/atom_api_cookies.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc
index 8698b43485bf..994fe6977f2a 100644
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -47,7 +47,7 @@ struct Converter<net::CanonicalCookie> {
     dict.Set("secure", val.IsSecure());
     dict.Set("httpOnly", val.IsHttpOnly());
     dict.Set("session", !val.IsPersistent());
-    if (!val.IsPersistent())
+    if (val.IsPersistent())
       dict.Set("expirationDate", val.ExpiryDate().ToDoubleT());
     return dict.GetHandle();
   }

From c682ccd9d07af6e32a8023ef84c794dd6f97bf2f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 8 May 2016 15:15:16 +0900
Subject: [PATCH 059/510] Suppress the window.open tests on travis CI's mac
 machine

---
 spec/chromium-spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index 577f020128ad..cd046ab29abf 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -155,6 +155,10 @@ describe('chromium feature', function () {
   })
 
   describe('window.open', function () {
+    if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
+      return
+    }
+
     this.timeout(20000)
 
     it('returns a BrowserWindowProxy object', function () {

From 70dac71639f6f0104601eab289364853b73a1be6 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 8 May 2016 16:44:14 +0530
Subject: [PATCH 060/510] delay protocol object creation

---
 atom/browser/api/atom_api_protocol.cc | 71 ++++++++-------------------
 atom/browser/api/atom_api_protocol.h  | 24 ++-------
 lib/browser/api/protocol.js           | 35 +++++++++----
 lib/browser/chrome-extension.js       |  7 +--
 4 files changed, 52 insertions(+), 85 deletions(-)

diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
index 20667ffd3a04..226f689d32de 100644
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -7,7 +7,6 @@
 #include "atom/browser/atom_browser_client.h"
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
-#include "atom/browser/browser.h"
 #include "atom/browser/net/url_request_async_asar_job.h"
 #include "atom/browser/net/url_request_buffer_job.h"
 #include "atom/browser/net/url_request_fetch_job.h"
@@ -24,40 +23,11 @@ namespace atom {
 
 namespace api {
 
-Protocol::Protocol(v8::Isolate* isolate)
-    : request_context_getter_(nullptr),
-      job_factory_(nullptr) {
-  if (Browser::Get()->is_ready()) {
-    OnWillFinishLaunching();
-  } else {
-    Browser::Get()->AddObserver(this);
-  }
-  Init(isolate);
-}
-
-Protocol::~Protocol() {
-  Browser::Get()->RemoveObserver(this);
-}
-
-void Protocol::OnWillFinishLaunching() {
-  auto browser_context = static_cast<atom::AtomBrowserContext*>(
-      atom::AtomBrowserMainParts::Get()->browser_context());
-  request_context_getter_ = browser_context->GetRequestContext();
-  job_factory_ = browser_context->job_factory();
+Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
+    : request_context_getter_(browser_context->GetRequestContext()),
+      job_factory_(browser_context->job_factory()) {
   CHECK(job_factory_);
-}
-
-void Protocol::RegisterStandardSchemes(
-    const std::vector<std::string>& schemes) {
-  if (Browser::Get()->is_ready()) {
-    isolate()->ThrowException(v8::Exception::Error(mate::StringToV8(
-        isolate(),
-        "protocol.registerStandardSchemes should be called before"
-        "app is ready")));
-    return;
-  }
-  for (const auto& scheme : schemes)
-    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
+  Init(isolate);
 }
 
 void Protocol::RegisterServiceWorkerSchemes(
@@ -69,10 +39,6 @@ void Protocol::UnregisterProtocol(
     const std::string& scheme, mate::Arguments* args) {
   CompletionCallback callback;
   args->GetNext(&callback);
-  if (!job_factory_) {
-    OnIOCompleted(callback, PROTOCOL_FAIL);
-    return;
-  }
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&Protocol::UnregisterProtocolInIO,
@@ -91,10 +57,6 @@ Protocol::ProtocolError Protocol::UnregisterProtocolInIO(
 
 void Protocol::IsProtocolHandled(const std::string& scheme,
                                     const BooleanCallback& callback) {
-  if (!job_factory_) {
-    callback.Run(false);
-    return;
-  }
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&Protocol::IsProtocolHandledInIO,
@@ -110,10 +72,6 @@ void Protocol::UninterceptProtocol(
     const std::string& scheme, mate::Arguments* args) {
   CompletionCallback callback;
   args->GetNext(&callback);
-  if (!job_factory_) {
-    OnIOCompleted(callback, PROTOCOL_FAIL);
-    return;
-  }
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&Protocol::UninterceptProtocolInIO,
@@ -160,15 +118,15 @@ std::string Protocol::ErrorCodeToString(ProtocolError error) {
 }
 
 // static
-mate::Handle<Protocol> Protocol::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new Protocol(isolate));
+mate::Handle<Protocol> Protocol::Create(
+    v8::Isolate* isolate, AtomBrowserContext* browser_context) {
+  return mate::CreateHandle(isolate, new Protocol(isolate, browser_context));
 }
 
 // static
 void Protocol::BuildPrototype(
     v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototype) {
   mate::ObjectTemplateBuilder(isolate, prototype)
-      .SetMethod("registerStandardSchemes", &Protocol::RegisterStandardSchemes)
       .SetMethod("registerServiceWorkerSchemes",
                  &Protocol::RegisterServiceWorkerSchemes)
       .SetMethod("registerStringProtocol",
@@ -198,11 +156,24 @@ void Protocol::BuildPrototype(
 
 namespace {
 
+void RegisterStandardSchemes(
+    const std::vector<std::string>& schemes) {
+  for (const auto& scheme : schemes)
+    url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
+}
+
+mate::Handle<atom::api::Protocol> CreateProtocol(v8::Isolate* isolate) {
+  auto browser_context = static_cast<atom::AtomBrowserContext*>(
+      atom::AtomBrowserMainParts::Get()->browser_context());
+  return atom::api::Protocol::Create(isolate, browser_context);
+}
+
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("protocol", atom::api::Protocol::Create(isolate));
+  dict.SetMethod("createProtocolObject", base::Bind(&CreateProtocol, isolate));
+  dict.SetMethod("registerStandardSchemes", &RegisterStandardSchemes);
 }
 
 }  // namespace
diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h
index 80b7006259a9..19fca9ac81bd 100644
--- a/atom/browser/api/atom_api_protocol.h
+++ b/atom/browser/api/atom_api_protocol.h
@@ -9,7 +9,6 @@
 #include <map>
 #include <vector>
 
-#include "atom/browser/browser_observer.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ -31,25 +30,21 @@ class AtomURLRequestJobFactory;
 
 namespace api {
 
-class Protocol : public mate::Wrappable<Protocol>,
-                 public BrowserObserver {
+class Protocol : public mate::Wrappable<Protocol> {
  public:
   using Handler =
       base::Callback<void(const net::URLRequest*, v8::Local<v8::Value>)>;
   using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
   using BooleanCallback = base::Callback<void(bool)>;
 
-  static mate::Handle<Protocol> Create(v8::Isolate* isolate);
+  static mate::Handle<Protocol> Create(
+      v8::Isolate* isolate, AtomBrowserContext* browser_context);
 
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::ObjectTemplate> prototype);
 
  protected:
-  explicit Protocol(v8::Isolate* isolate);
-  ~Protocol();
-
-  // BrowserObserver:
-  void OnWillFinishLaunching() override;
+  Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context);
 
  private:
   // Possible errors.
@@ -93,9 +88,6 @@ class Protocol : public mate::Wrappable<Protocol>,
     DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
   };
 
-  // Register schemes to standard scheme list.
-  void RegisterStandardSchemes(const std::vector<std::string>& schemes);
-
   // Register schemes that can handle service worker.
   void RegisterServiceWorkerSchemes(const std::vector<std::string>& schemes);
 
@@ -106,10 +98,6 @@ class Protocol : public mate::Wrappable<Protocol>,
                         mate::Arguments* args) {
     CompletionCallback callback;
     args->GetNext(&callback);
-    if (!job_factory_) {
-      OnIOCompleted(callback, PROTOCOL_FAIL);
-      return;
-    }
     content::BrowserThread::PostTaskAndReplyWithResult(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&Protocol::RegisterProtocolInIO<RequestJob>,
@@ -147,10 +135,6 @@ class Protocol : public mate::Wrappable<Protocol>,
                          mate::Arguments* args) {
     CompletionCallback callback;
     args->GetNext(&callback);
-    if (!job_factory_) {
-      OnIOCompleted(callback, PROTOCOL_FAIL);
-      return;
-    }
     content::BrowserThread::PostTaskAndReplyWithResult(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&Protocol::InterceptProtocolInIO<RequestJob>,
diff --git a/lib/browser/api/protocol.js b/lib/browser/api/protocol.js
index 3c7bed5d1cc5..2507acddc83d 100644
--- a/lib/browser/api/protocol.js
+++ b/lib/browser/api/protocol.js
@@ -1,4 +1,6 @@
-const protocol = process.atomBinding('protocol').protocol
+const app = require('electron').app
+const {createProtocolObject, registerStandardSchemes} = process.atomBinding('protocol')
+let protocol = null
 
 // Warn about removed APIs.
 var logAndThrow = function (callback, message) {
@@ -10,16 +12,29 @@ var logAndThrow = function (callback, message) {
   }
 }
 
-protocol.registerProtocol = function (scheme, handler, callback) {
-  return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
+exports.registerStandardSchemes = function (schemes) {
+  if (app.isReady()) {
+    throw new Error('protocol.registerStandardSchemes should be called before app is ready')
+  }
+  registerStandardSchemes(schemes)
 }
 
-protocol.isHandledProtocol = function (scheme, callback) {
-  return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.')
-}
+app.once('ready', function () {
+  protocol = createProtocolObject()
+  // Be compatible with old APIs.
+  protocol.registerProtocol = function (scheme, handler, callback) {
+    return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
+  }
 
-protocol.interceptProtocol = function (scheme, handler, callback) {
-  return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
-}
+  protocol.isHandledProtocol = function (scheme, callback) {
+    return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.')
+  }
 
-module.exports = protocol
+  protocol.interceptProtocol = function (scheme, handler, callback) {
+    return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
+  }
+
+  for (let method in protocol) {
+    exports[method] = protocol[method].bind(protocol)
+  }
+})
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 562e77a11509..9da12720ae30 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -1,5 +1,4 @@
-const electron = require('electron')
-const app = electron.app
+const {app, protocol, BrowserWindow} = require('electron')
 const fs = require('fs')
 const path = require('path')
 const url = require('url')
@@ -70,9 +69,7 @@ app.on('will-quit', function () {
 
 // We can not use protocol or BrowserWindow until app is ready.
 app.once('ready', function () {
-  var BrowserWindow, chromeExtensionHandler, i, init, len, protocol, srcDirectory
-  protocol = electron.protocol
-  BrowserWindow = electron.BrowserWindow
+  var chromeExtensionHandler, i, init, len, srcDirectory
 
   // Load persisted extensions.
   loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions')

From ac905e708009d17cf048c296e802f68c21a6a721 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Sun, 8 May 2016 10:50:17 -0700
Subject: [PATCH 061/510] Add docs, avoid side effects when not currently
 default

---
 atom/browser/browser_mac.mm | 3 +++
 docs/api/app.md             | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index 767ddee590ec..3cabd98b692c 100644
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -47,6 +47,9 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
   if (!identifier)
     return false;
 
+  if (!Browser::IsDefaultProtocolClient(protocol))
+    return false;
+
   NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
   CFStringRef protocol_cf = base::mac::NSToCFCast(protocol_ns);
   CFArrayRef bundleList = LSCopyAllHandlersForURLScheme(protocol_cf);
diff --git a/docs/api/app.md b/docs/api/app.md
index c6c5887ef623..cb19b49b7c18 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -393,16 +393,13 @@ Please refer to [Apple's documentation][CFBundleURLTypes] for details.
 
 The API uses the Windows Registry and LSSetDefaultHandlerForURLScheme internally.
 
-### `app.removeAsDefaultProtocolClient(protocol)` _Windows_
+### `app.removeAsDefaultProtocolClient(protocol)` _OS X_ _Windows_
 
 * `protocol` String - The name of your protocol, without `://`.
 
 This method checks if the current executable as the default handler for a protocol
 (aka URI scheme). If so, it will remove the app as the default handler.
 
-**Note:** On OS X, removing the app will automatically remove the app as the
-default protocol handler.
-
 ### `app.isDefaultProtocolClient(protocol)` _OS X_ _Windows_
 
 * `protocol` String - The name of your protocol, without `://`.

From fe5dc5d28edebd4a9b80ea6f49e201ae61fec060 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Mon, 9 May 2016 10:43:52 +0900
Subject: [PATCH 062/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/api/web-contents.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index 3405d5f0266e..f3df544cf3c1 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -646,9 +646,9 @@ mainWindow.webContents.on('devtools-opened', function() {
 
 * `options` Object (optional)
   * `detach` Boolean - 새 창에서 개발자 도구를 엽니다.
-  * `mode` String - 개발자 도구 표시 상태를 지정합니다. 옵션은 "right", "bottom",
-    "undocked", "detach"가 될 수 있습니다. 기본값은 마지막 표시 상태를
-    사용합니다. `undocked` 모드에선 다시 독을 할 수 있습니다. 하지만 `detach`
+  * `mode` String - 개발자 도구를 지정한 도킹 상태와 함께 엽니다. 옵션은 `right`,
+    `bottom`, `undocked`, `detach`가 될 수 있습니다. 기본값은 마지막 표시 상태를
+    사용합니다. `undocked` 모드에선 다시 도킹을 할 수 있습니다. 하지만 `detach`
     모드에선 할 수 없습니다.
 
 개발자 도구를 엽니다.

From ad4450ec884efdae644b0214621d8a14cd4d1ae8 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Mon, 9 May 2016 11:23:46 +0900
Subject: [PATCH 063/510] :memo: Small fixes

[ci skip]
---
 docs-translations/ko-KR/api/clipboard.md                    | 2 +-
 docs-translations/ko-KR/api/content-tracing.md              | 2 +-
 docs-translations/ko-KR/api/dialog.md                       | 2 +-
 docs-translations/ko-KR/api/ipc-renderer.md                 | 2 +-
 docs-translations/ko-KR/api/protocol.md                     | 6 +++---
 docs-translations/ko-KR/api/web-view-tag.md                 | 2 +-
 docs-translations/ko-KR/api/window-open.md                  | 2 +-
 .../ko-KR/development/build-instructions-windows.md         | 2 +-
 .../ko-KR/development/debug-instructions-windows.md         | 4 ++--
 .../ko-KR/tutorial/desktop-environment-integration.md       | 6 +++---
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs-translations/ko-KR/api/clipboard.md b/docs-translations/ko-KR/api/clipboard.md
index 83775dfa78b8..0590713e83b3 100644
--- a/docs-translations/ko-KR/api/clipboard.md
+++ b/docs-translations/ko-KR/api/clipboard.md
@@ -7,7 +7,7 @@ const clipboard = require('electron').clipboard;
 clipboard.writeText('Example String');
 ```
 
-X Window 시스템에선 selection 클립보드도 존재합니다. 이를 사용하려면 인자 뒤에
+X Window 시스템에선 selection 클립보드도 존재합니다. 이를 사용하려면 인수 뒤에
 `selection` 문자열을 같이 지정해주어야 합니다:
 
 ```javascript
diff --git a/docs-translations/ko-KR/api/content-tracing.md b/docs-translations/ko-KR/api/content-tracing.md
index 484197e20738..ac923ee9fe90 100644
--- a/docs-translations/ko-KR/api/content-tracing.md
+++ b/docs-translations/ko-KR/api/content-tracing.md
@@ -36,7 +36,7 @@ contentTracing.startRecording(options, function() {
 카테고리 그룹 세트를 가져옵니다. 카테고리 그룹은 도달된 코드 경로를 변경할 수 있습니다.
 
 모든 child 프로세스가 `getCategories` 요청을 승인하면 `callback`이 한 번 호출되며
-인자에 카테고리 그룹의 배열이 전달됩니다.
+인수에 카테고리 그룹의 배열이 전달됩니다.
 
 ### `contentTracing.startRecording(options, callback)`
 
diff --git a/docs-translations/ko-KR/api/dialog.md b/docs-translations/ko-KR/api/dialog.md
index 90d76df16692..2110e376c27c 100644
--- a/docs-translations/ko-KR/api/dialog.md
+++ b/docs-translations/ko-KR/api/dialog.md
@@ -131,7 +131,7 @@ Linux에서 `ready` 이벤트가 발생하기 전에 이 API를 호출할 경우
 
 ## Sheets
 
-Mac OS X에선, `browserWindow` 인자에 `BrowserWindow` 객체 참조를 전달하면 대화
+Mac OS X에선, `browserWindow` 인수에 `BrowserWindow` 객체 참조를 전달하면 대화
 상자가 해당 윈도우에 시트처럼 표시되도록 표현할 수 있습니다. 윈도우의 객체 참조가
 제공되지 않으면 모달 형태로 표시됩니다.
 
diff --git a/docs-translations/ko-KR/api/ipc-renderer.md b/docs-translations/ko-KR/api/ipc-renderer.md
index 19681515fefc..3584d41b556d 100644
--- a/docs-translations/ko-KR/api/ipc-renderer.md
+++ b/docs-translations/ko-KR/api/ipc-renderer.md
@@ -67,7 +67,7 @@
 * `arg` (optional)
 
 `channel`을 통해 메인 프로세스에 동기 메시지를 보냅니다. 그리고 필요에 따라 임의의
-인자를 사용할 수도 있습니다. 인수들은 내부적으로 JSON 포맷으로 직렬화 되며, 이후 함수와
+인수를 사용할 수도 있습니다. 인수들은 내부적으로 JSON 포맷으로 직렬화 되며, 이후 함수와
 프로토타입 체인은 포함되지 않게 됩니다.
 
 메인 프로세스는 `ipcMain` 모듈을 통해 `channel` 이벤트를 리스닝 할 수 있고,
diff --git a/docs-translations/ko-KR/api/protocol.md b/docs-translations/ko-KR/api/protocol.md
index 51207f8e0ee7..40ee6f192dd7 100644
--- a/docs-translations/ko-KR/api/protocol.md
+++ b/docs-translations/ko-KR/api/protocol.md
@@ -62,12 +62,12 @@ The `uploadData` is an array of `data` objects:
   * `bytes` Buffer - Content being sent.
   * `file` String - Path of file being uploaded.
 
-`request`를 처리할 때 반드시 파일 경로 또는 `path` 속성을 포함하는 객체를 인자에
+`request`를 처리할 때 반드시 파일 경로 또는 `path` 속성을 포함하는 객체를 인수에
 포함하여 `callback`을 호출해야 합니다. 예: `callback(filePath)` 또는
 `callback({path: filePath})`.
 
-만약 `callback`이 아무 인자도 없이 호출되거나 숫자나 `error` 프로퍼티를 가진 객체가
-인자로 전달될 경우 `request`는 지정한 `error` 코드(숫자)를 출력합니다. 사용할 수 있는
+만약 `callback`이 아무 인수도 없이 호출되거나 숫자나 `error` 프로퍼티를 가진 객체가
+인수로 전달될 경우 `request`는 지정한 `error` 코드(숫자)를 출력합니다. 사용할 수 있는
 에러 코드는 [네트워크 에러 목록][net-error]에서 확인할 수 있습니다.
 
 기본적으로 `scheme`은 `http:`와 같이 처리됩니다. `file:`과 같이 "일반적인 URI 문법"
diff --git a/docs-translations/ko-KR/api/web-view-tag.md b/docs-translations/ko-KR/api/web-view-tag.md
index ae446975ef28..63b6a92ae896 100644
--- a/docs-translations/ko-KR/api/web-view-tag.md
+++ b/docs-translations/ko-KR/api/web-view-tag.md
@@ -450,7 +450,7 @@ Webview 페이지를 PDF 형식으로 인쇄합니다.
 * `args` (optional)
 
 `channel`을 통해 렌더러 프로세스로 비동기 메시지를 보냅니다. 또한 `args`를 지정하여
-임의의 인자를 보낼 수도 있습니다. 렌더러 프로세스는 `ipcRenderer` 모듈의 `channel`
+임의의 인수를 보낼 수도 있습니다. 렌더러 프로세스는 `ipcRenderer` 모듈의 `channel`
 이벤트로 이 메시지를 받아 처리할 수 있습니다.
 
 예시는 [webContents.send](web-contents.md#webcontentssendchannel-args)를 참고하세요.
diff --git a/docs-translations/ko-KR/api/window-open.md b/docs-translations/ko-KR/api/window-open.md
index 259b08dc5966..ac291283f546 100644
--- a/docs-translations/ko-KR/api/window-open.md
+++ b/docs-translations/ko-KR/api/window-open.md
@@ -11,7 +11,7 @@
 합니다.
 
 새롭게 생성된 `BrowserWindow`는 기본적으로 부모 창의 옵션을 상속합니다. 이 옵션을
-변경하려면 새 창을 열 때 `features` 인자를 지정해야 합니다.
+변경하려면 새 창을 열 때 `features` 인수를 지정해야 합니다.
 
 ### `window.open(url[, frameName][, features])`
 
diff --git a/docs-translations/ko-KR/development/build-instructions-windows.md b/docs-translations/ko-KR/development/build-instructions-windows.md
index 7d30635a6a04..e3804a410d36 100644
--- a/docs-translations/ko-KR/development/build-instructions-windows.md
+++ b/docs-translations/ko-KR/development/build-instructions-windows.md
@@ -61,7 +61,7 @@ $ python script\build.py -c D
 ## 64비트 빌드
 
 64비트를 타겟으로 빌드 하려면 부트스트랩 스크립트를 실행할 때 `--target_arch=x64`
-인자를 같이 넘겨주면 됩니다:
+인수를 같이 넘겨주면 됩니다:
 
 ```powershell
 $ python script\bootstrap.py -v --target_arch=x64
diff --git a/docs-translations/ko-KR/development/debug-instructions-windows.md b/docs-translations/ko-KR/development/debug-instructions-windows.md
index a0d50e475c76..35c49bc7e709 100644
--- a/docs-translations/ko-KR/development/debug-instructions-windows.md
+++ b/docs-translations/ko-KR/development/debug-instructions-windows.md
@@ -21,13 +21,13 @@ Electron 소스 코드가 중단점을 통해 순차적으로 쉽게 디버깅
   설정해야 합니다. 이 작업은 Visual Studio가 Electron에서 무슨일이 일어나는지 더 잘
   이해할 수 있도록 하며 변수를 사람이 읽기 좋은 포맷으로 쉽게 표현할 수 있도록 합니다.
 
-* **ProcMon**: 이 무료 [SysInternals][sys-internals] 툴은 프로세스 인자, 파일
+* **ProcMon**: 이 무료 [SysInternals][sys-internals] 툴은 프로세스 인수, 파일
   핸들러 그리고 레지스트리 작업을 탐색할 수 있게 도와줍니다.
 
 ## Electron에 디버거 연결하고 디버깅하기
 
 디버깅 작업을 시작하려면, PowerShell/CMD 중 한 가지를 열고 디버그 빌드 상태의
-Electron에 인자로 어플리케이션을 전달하여 실행합니다:
+Electron에 인수로 어플리케이션을 전달하여 실행합니다:
 
 ```powershell
 $ ./out/D/electron.exe ~/my-electron-app/
diff --git a/docs-translations/ko-KR/tutorial/desktop-environment-integration.md b/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
index 961bfc83076f..44cc66352425 100644
--- a/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
+++ b/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
@@ -90,7 +90,7 @@ app.clearRecentDocuments();
 않습니다. 어플리케이션 등록에 관련된 API의 모든 내용은 [Application Registration][app-registration]에서
 찾아볼 수 있습니다.
 
-유저가 JumpList에서 파일을 클릭할 경우 클릭된 파일의 경로가 커맨드 라인 인자로 추가되어
+유저가 JumpList에서 파일을 클릭할 경우 클릭된 파일의 경로가 커맨드 라인 인수로 추가되어
 새로운 인스턴스의 어플리케이션이 실행됩니다.
 
 ### OS X에서 주의할 점
@@ -149,7 +149,7 @@ __Internet Explorer의 작업:__
 ![IE](http://i.msdn.microsoft.com/dynimg/IC420539.png)
 
 OS X의 dock menu(진짜 메뉴)와는 달리 Windows의 사용자 작업은 어플리케이션 바로
-가기처럼 작동합니다. 유저가 작업을 클릭할 때 설정한 인자와 함께 새로운 어플리케이션이
+가기처럼 작동합니다. 유저가 작업을 클릭할 때 설정한 인수와 함께 새로운 어플리케이션이
 실행됩니다.
 
 사용자 작업을 설정하려면 [app.setUserTasks][setusertaskstasks] 메서드를 통해 구현할
@@ -168,7 +168,7 @@ app.setUserTasks([
 ]);
 ```
 
-작업 리스트를 비우려면 간단히 `app.setUserTasks` 메서드의 첫번째 인자에 빈 배열을 넣어
+작업 리스트를 비우려면 간단히 `app.setUserTasks` 메서드의 첫번째 인수에 빈 배열을 넣어
 호출하면 됩니다:
 
 ```javascript

From 897d3769789d5f2fadd4fc7bd1bace9917248772 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Mon, 9 May 2016 16:20:05 +0900
Subject: [PATCH 064/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/README.md             |  1 +
 docs-translations/ko-KR/api/app.md            | 43 ++++++++++--
 docs-translations/ko-KR/api/browser-window.md |  6 ++
 docs-translations/ko-KR/api/process.md        |  3 +
 docs-translations/ko-KR/api/protocol.md       | 15 +++--
 docs-translations/ko-KR/api/web-contents.md   | 65 ++++++++++++++++---
 docs-translations/ko-KR/faq/electron-faq.md   | 15 +++--
 docs-translations/ko-KR/styleguide.md         |  2 +-
 8 files changed, 124 insertions(+), 26 deletions(-)

diff --git a/docs-translations/ko-KR/README.md b/docs-translations/ko-KR/README.md
index 63c8716e4fca..629c3ec8c210 100644
--- a/docs-translations/ko-KR/README.md
+++ b/docs-translations/ko-KR/README.md
@@ -20,6 +20,7 @@ Electron에 대해 자주 묻는 질문이 있습니다. 이슈를 생성하기
 ## 개발 가이드
 
 * [지원하는 플랫폼](tutorial/supported-platforms.md)
+* [보안](tutorial/security.md)
 * [어플리케이션 배포](tutorial/application-distribution.md)
 * [Mac 앱스토어 어플리케이션 제출 가이드](tutorial/mac-app-store-submission-guide.md)
 * [어플리케이션 패키징](tutorial/application-packaging.md)
diff --git a/docs-translations/ko-KR/api/app.md b/docs-translations/ko-KR/api/app.md
index 1d6140435e7d..a64245688780 100644
--- a/docs-translations/ko-KR/api/app.md
+++ b/docs-translations/ko-KR/api/app.md
@@ -114,8 +114,26 @@ Returns:
 * `event` Event
 * `hasVisibleWindows` Boolean
 
-어플리케이션이 활성화 되었을 때 발생하는 이벤트 입니다.
-이 이벤트는 어플리케이션의 dock 아이콘을 클릭했을 때 주로 발생합니다.
+어플리케이션이 활성화 되었을 때 발생하는 이벤트 입니다. 이 이벤트는 사용자가
+어플리케이션의 dock 아이콘을 클릭했을 때 주로 발생합니다.
+
+### Event: 'continue-activity' _OS X_
+
+Returns:
+
+* `event` Event
+* `type` String - Activity를 식별하는 문자열.
+  [`NSUserActivity.activityType`][activity-type]을 맵핑합니다.
+* `userInfo` Object - 다른 기기의 activity에서 저장된 앱-특정 상태를 포함합니다.
+
+다른 기기에서 받아온 activity를 재개하려고 할 때 [Handoff][handoff] 하는 동안
+발생하는 이벤트입니다. 이 이벤트를 처리하려면 반드시 `event.preventDefault()`를
+호출해야 합니다.
+
+사용자 activity는 activity의 소스 어플리케이션과 같은 개발자 팀 ID를 가지는
+어플리케이션 안에서만 재개될 수 있고, activity의 타입을 지원합니다. 지원하는
+activity의 타입은 어플리케이션 `Info.plist`의 `NSUserActivityTypes` 키에 열거되어
+있습니다.
 
 ### Event: 'browser-window-blur'
 
@@ -383,15 +401,13 @@ npm 모듈 규칙에 따라 대부분의 경우 `package.json`의 `name` 필드
 
 이 API는 내부적으로 Windows 레지스트리와 LSSetDefaultHandlerForURLScheme를 사용합니다.
 
-### `app.removeAsDefaultProtocolClient(protocol)` _Windows_
+### `app.removeAsDefaultProtocolClient(protocol)` _OS X_ _Windows_
 
 * `protocol` String - 프로토콜의 이름, `://` 제외.
 
 이 메서드는 현재 실행파일이 지정한 프로토콜(URI scheme)에 대해 기본 핸들러인지를
 확인합니다. 만약 그렇다면, 이 메서드는 앱을 기본 핸들러에서 제거합니다.
 
-**참고:** OS X에서는 앱을 제거하면 자동으로 기본 프로토콜 핸들러에서 제거됩니다.
-
 ### `app.isDefaultProtocolClient(protocol)` _OS X_ _Windows_
 
 * `protocol` String - `://`를 제외한 프로토콜의 이름.
@@ -418,7 +434,7 @@ Windows에서 사용할 수 있는 JumpList의 [Tasks][tasks] 카테고리에 `t
 `Task` Object:
 * `program` String - 실행할 프로그램의 경로.
   보통 현재 작동중인 어플리케이션의 경로인 `process.execPath`를 지정합니다.
-* `arguments` String - `program`이 실행될 때 사용될 명령줄 인자.
+* `arguments` String - `program`이 실행될 때 사용될 명령줄 인수.
 * `title` String - JumpList에 표시할 문자열.
 * `description` String - 이 작업에 대한 설명.
 * `iconPath` String - JumpList에 표시될 아이콘의 절대 경로.
@@ -491,6 +507,19 @@ app.on('ready', function() {
 });
 ```
 
+### `app.setUserActivity(type, userInfo)` _OS X_
+
+* `type` String - 고유하게 activity를 식별합니다.
+  [`NSUserActivity.activityType`][activity-type]을 맵핑합니다.
+* `userInfo` Object - 다른 기기에서 사용하기 위해 저장할 앱-특정 상태.
+
+`NSUserActivity`를 만들고 현재 activity에 설정합니다. 이 activity는 이후 다른 기기와
+[Handoff][handoff]할 때 자격으로 사용됩니다.
+
+### `app.getCurrentActivityType()` _OS X_
+
+현재 작동중인 activity의 타입을 반환합니다.
+
 ### `app.setAppUserModelId(id)` _Windows_
 
 * `id` String
@@ -577,3 +606,5 @@ dock 아이콘의 `image`를 설정합니다.
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
 [CFBundleURLTypes]: https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/TP40009249-102207-TPXREF115
 [LSCopyDefaultHandlerForURLScheme]: https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme
+[handoff]: https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/Handoff/HandoffFundamentals/HandoffFundamentals.html
+[activity-type]: https://developer.apple.com/library/ios/documentation/Foundation/Reference/NSUserActivity_Class/index.html#//apple_ref/occ/instp/NSUserActivity/activityType
diff --git a/docs-translations/ko-KR/api/browser-window.md b/docs-translations/ko-KR/api/browser-window.md
index 76257c8463b7..23f1c26ba752 100644
--- a/docs-translations/ko-KR/api/browser-window.md
+++ b/docs-translations/ko-KR/api/browser-window.md
@@ -97,6 +97,10 @@ win.show();
 * `webPreferences` Object - 웹 페이지 기능을 설정합니다. 사용할 수 있는 속성은
   아래를 참고하세요.
 
+`minWidth`/`maxWidth`/`minHeight`/`maxHeight`를 통해 최소 또는 최대 윈도우 크기를
+지정한 경우, 이는 사용자만을 제약하며, `setBounds`/`setSize` 또는 `BrowserWindow`의
+생성자에서 크기 제약을 따르지 않는 윈도우 크기를 전달하는 것은 막을 수 없습니다.
+
 `type` 속성에서 사용할 수 있는 값과 동작은 다음과 같으며, 플랫폼에 따라 다릅니다:
 
 * Linux의 경우, `desktop`, `dock`, `toolbar`, `splash`, `notification` 종류를
@@ -161,6 +165,8 @@ win.show();
   활성화합니다. 기본값은 `false`입니다.
 * `directWrite` Boolean - Windows에서 폰트 렌더링을 위해 DirectWrite를
   사용하는지를 지정합니다. 기본값은 `true`입니다.
+* `scrollBounce` Boolean - OS X에서 스크롤 튕기기 효과 (탄성 밴딩)를 활성화 합니다.
+  기본값은 `false`입니다.
 * `blinkFeatures` String - `CSSVariables,KeyboardEventKey`같은 `,`로 구분된
   기능 문자열들의 리스트입니다. 지원하는 전체 기능 문자열들은
   [setFeatureEnabledFromString][blink-feature-string] 함수에서 찾을 수 있습니다.
diff --git a/docs-translations/ko-KR/api/process.md b/docs-translations/ko-KR/api/process.md
index 9d5d6d88ab37..bf2a314c72a4 100644
--- a/docs-translations/ko-KR/api/process.md
+++ b/docs-translations/ko-KR/api/process.md
@@ -13,6 +13,9 @@ Electron의 `process` 객체는 기존의 node와는 달리 약간의 차이점
   빌드일 땐 `undefined`로 지정됩니다.
 * `process.windowsStore` Boolean - 만약 앱이 Windows Store 앱 (appx)으로 작동하고
   있다면, 이 값이 `true`로 지정되며 다른 빌드인 경우엔 `undefined`로 지정됩니다.
+* `process.defaultApp` Boolean - 어플리케이션이 기본 어플리케이션 형식으로 전달되는
+  인수와 함께 실행됐을 때, 메인 프로세스에서 이 값이 `true`가 되며 다른 경우엔
+  `undefined`가 됩니다.
 
 ## Events
 
diff --git a/docs-translations/ko-KR/api/protocol.md b/docs-translations/ko-KR/api/protocol.md
index 40ee6f192dd7..8c3e2c2934ac 100644
--- a/docs-translations/ko-KR/api/protocol.md
+++ b/docs-translations/ko-KR/api/protocol.md
@@ -6,11 +6,10 @@
 
 ```javascript
 const electron = require('electron');
-const app = electron.app;
+const { app, protocol } = electron;
 const path = require('path');
 
 app.on('ready', function() {
-    var protocol = electron.protocol;
     protocol.registerFileProtocol('atom', function(request, callback) {
       var url = request.url.substr(7);
       callback({path: path.normalize(__dirname + '/' + url)});
@@ -21,7 +20,8 @@ app.on('ready', function() {
 });
 ```
 
-**참고:** 이 모듈은 `app` 모듈의 `ready` 이벤트가 발생한 이후에만 사용할 수 있습니다.
+**참고:** 모든 메서드는 따로 표기하지 않는 한 `app` 모듈의 `ready` 이벤트가 발생한
+이후에만 사용할 수 있습니다.
 
 ## Methods
 
@@ -32,11 +32,16 @@ app.on('ready', function() {
 * `schemes` Array - 표준 스킴으로 등록할 커스텀 스킴 리스트
 
 표준 `scheme`의 형식은 RFC 3986 [일반 URI 구문](https://tools.ietf.org/html/rfc3986#section-3)
-표준을 따릅니다. 이 형식은 `file:`과 `filesystem:`을 포함합니다.
+표준을 따릅니다. 이 형식은 `file:`, `filesystem:`, `http` 등을 포함합니다. 스킴을
+표준을 따라 등록하면, 스킴이 제공될 때 상대, 절대 경로의 리소스를 올바르게 취할 수
+있습니다.
+
+**참고:** 이 메서드는 `app` 모듈의 `ready` 이벤트가 발생하기 이전에만 사용할 수
+있습니다.
 
 ### `protocol.registerServiceWorkerSchemes(schemes)`
 
-* `schemes` Array - 등록될 서비스 워커를 조작할 커스텀 스키마
+* `schemes` Array - 서비스 워커를 제어하기 위해 등록될 커스텀 스킴.
 
 ### `protocol.registerFileProtocol(scheme, handler[, completion])`
 
diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index f3df544cf3c1..7962b4e439b7 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -38,7 +38,8 @@ Returns:
 이 이벤트는 `did-finish-load`와 비슷하나, 로드가 실패했거나 취소되었을 때 발생합니다.
 예를 들면 `window.stop()`이 실행되었을 때 발생합니다. 발생할 수 있는 전체 에러 코드의
 목록과 설명은 [여기](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h)서
-확인할 수 있습니다.
+확인할 수 있습니다. 참고로 리다이렉트 응답은 `errorCode` -3과 함께 발생합니다; 이
+에러는 명시적으로 무시할 수 있습니다.
 
 ### Event: 'did-frame-finish-load'
 
@@ -292,7 +293,7 @@ Returns:
 * `image` NativeImage (optional)
 * `scale` Float (optional)
 
-커서 타입이 변경될 때 발생하는 이벤트입니다. `type` 매개변수는 다음 값이 될 수 있습니다:
+커서 타입이 변경될 때 발생하는 이벤트입니다. `type` 인수는 다음 값이 될 수 있습니다:
 `default`, `crosshair`, `pointer`, `text`, `wait`, `help`, `e-resize`, `n-resize`,
 `ne-resize`, `nw-resize`, `s-resize`, `se-resize`, `sw-resize`, `w-resize`,
 `ns-resize`, `ew-resize`, `nesw-resize`, `nwse-resize`, `col-resize`,
@@ -301,10 +302,59 @@ Returns:
 `cell`, `context-menu`, `alias`, `progress`, `nodrop`, `copy`, `none`,
 `not-allowed`, `zoom-in`, `zoom-out`, `grab`, `grabbing`, `custom`.
 
-만약 `type` 매개변수가 `custom` 이고 `image` 매개변수가 `NativeImage`를 통한 커스텀
-커서를 지정했을 때, 해당 이미지로 커서가 변경됩니다. 또한 `scale` 매개변수는 이미지의
+만약 `type` 인수가 `custom` 이고 `image` 인수가 `NativeImage`를 통한 커스텀
+커서를 지정했을 때, 해당 이미지로 커서가 변경됩니다. 또한 `scale` 인수는 이미지의
 크기를 조정합니다.
 
+### Event: 'context-menu'
+
+Returns:
+
+* `event` Event
+* `params` Object
+  * `x` Integer - x 좌표
+  * `y` Integer - y 좌표
+  * `linkURL` String - 컨텍스트 메뉴가 호출된 노드를 둘러싸는 링크의 URL.
+  * `linkText` String - 링크에 연관된 텍스트. 콘텐츠의 링크가 이미지인 경우 빈
+    문자열이 됩니다.
+  * `pageURL` String - 컨텍스트 메뉴가 호출된 상위 수준 페이지의 URL.
+  * `frameURL` String - 컨텍스트 메뉴가 호출된 서브 프레임의 URL.
+  * `srcURL` String - 컨텍스트 메뉴가 호출된 요소에 대한 소스 URL. 요소와 소스 URL은
+    이미지, 오디오, 비디오입니다.
+  * `mediaType` String - 컨텍스트 메뉴가 호출된 노드의 타입. 값은 `none`, `image`,
+    `audio`, `video`, `canvas`, `file` 또는 `plugin`이 될 수 있습니다.
+  * `mediaFlags` Object - 컨텍스트 메뉴가 호출된 미디어 요소에 대한 인수들.
+    * `inError` - Boolean
+    * `isPaused` - Boolean
+    * `isMuted` - Boolean
+    * `hasAudio` - Boolean
+    * `isLooping` - Boolean
+    * `isControlsVisible` - Boolean
+    * `canToggleControls` - Boolean
+    * `canRotate` - Boolean
+  * `hasImageContent` Boolean - 컨텍스트 메뉴가 내용이 있는 이미지에서 호출되었는지
+    여부.
+  * `isEditable` Boolean - 컨텍스트를 편집할 수 있는지 여부.
+  * `editFlags` Object - 이 플래그는 랜더러가 다음 행동을 취할 수 있는지 여부를
+    표시합니다.
+    * `canUndo` - Boolean
+    * `canRedo` - Boolean
+    * `canCut` - Boolean
+    * `canCopy` - Boolean
+    * `canPaste` - Boolean
+    * `canDelete` - Boolean
+    * `canSelectAll` - Boolean
+  * `selectionText` String - 컨텍스트 메뉴가 호출된 부분에 있는 선택된 텍스트.
+  * `titleText` String - 컨텍스트 메뉴가 호출된 선택된 제목 또는 알림 텍스트.
+  * `misspelledWord` String - 만약 있는 경우, 커서가 가르키는 곳에서 발생한 오타.
+  * `frameCharset` String - 메뉴가 호출된 프레임의 문자열 인코딩.
+  * `inputFieldType` String - 컨텍스트 메뉴가 입력 필드에서 호출되었을 때, 그 필드의
+    타입. 값은 `none`, `plainText`, `password`, `other` 중 한 가지가 될 수 있습니다.
+  * `menuSourceType` String - 컨텍스트 메뉴를 호출한 입력 소스. 값은 `none`,
+    `mouse`, `keyboard`, `touch`, `touchMenu` 중 한 가지가 될 수 있습니다.
+
+새로운 컨텍스트 메뉴의 제어가 필요할 때 발생하는 이벤트입니다.
+
 ## Instance Methods
 
 `webContents`객체는 다음과 같은 인스턴스 메서드들을 가지고 있습니다.
@@ -576,7 +626,7 @@ print기능을 사용하지 않는 경우 전체 바이너리 크기를 줄이
 ### `webContents.printToPDF(options, callback)`
 
 * `options` Object
-  * `marginsType` Integer - 사용할 마진의 종류를 지정합니다. 0 부터 2 사이 값을 사용할
+  * `marginsType` Integer - 사용할 마진의 타입을 지정합니다. 0 부터 2 사이 값을 사용할
     수 있고 각각 기본 마진, 마진 없음, 최소 마진입니다.
   * `pageSize` String - 생성되는 PDF의 페이지 크기를 지정합니다. 값은 `A3`, `A4`,
     `A5`, `Legal`, `Letter` 와 `Tabloid`가 사용될 수 있습니다.
@@ -898,7 +948,7 @@ win.webContents.debugger.sendCommand("Network.enable");
 
 * `method` String - 메서드 이름, 반드시 원격 디버깅 프로토콜에 의해 정의된 메서드중
   하나가 됩니다.
-* `commandParams` Object (optional) - 요청 매개변수를 표현한 JSON 객체.
+* `commandParams` Object (optional) - 요청 인수를 표현한 JSON 객체.
 * `callback` Function (optional) - 응답
   * `error` Object -  커맨드의 실패를 표시하는 에러 메시지.
   * `result` Object - 원격 디버깅 프로토콜에서 커맨드 설명의 'returns' 속성에 의해
@@ -918,8 +968,7 @@ win.webContents.debugger.sendCommand("Network.enable");
 
 * `event` Event
 * `method` String - 메서드 이름.
-* `params` Object - 원격 디버깅 프로토콜의 'parameters' 속성에서 정의된 이벤트
-  매개변수
+* `params` Object - 원격 디버깅 프로토콜의 'parameters' 속성에서 정의된 이벤트 인수
 
 디버깅 타겟이 관련 이벤트를 발생시킬 때 마다 발생하는 이벤트입니다.
 
diff --git a/docs-translations/ko-KR/faq/electron-faq.md b/docs-translations/ko-KR/faq/electron-faq.md
index a038142c5ae3..ae77335b0008 100644
--- a/docs-translations/ko-KR/faq/electron-faq.md
+++ b/docs-translations/ko-KR/faq/electron-faq.md
@@ -3,16 +3,19 @@
 ## 언제 Electron이 최신 버전의 Chrome으로 업그레이드 되나요?
 
 Electron의 Chrome 버전은 보통 새로운 Chrome 안정 버전이 릴리즈 된 이후 1주 내지 2주
-내로 업데이트됩니다.
+내로 업데이트됩니다. 하지만 이러한 업데이트 주기는 보장되지 않으며 업그레이드에 필요한
+작업의 양에 따라 달라집니다.
 
-또한 우리는 크롬의 안정된 채널만을 이용합니다, 만약 중요한 수정이 베타 또는 개발 채널인
-경우, 우리는 해당 버전 대신 이전 버전을 다시 사용합니다.
+Electron은 크롬이 사용하는 안정된 채널만을 이용합니다, 만약 중요한 수정이 베타 또는
+개발 채널에 패치된 경우, 이전 버전의 채널로 롤백합니다.
+
+자세한 내용은 [보안 설명](../tutorial/electron-security.md)을 참고하세요.
 
 ## Electron은 언제 최신 버전의 Node.js로 업그레이드 하나요?
 
-새로운 버전의 Node.js가 릴리즈 되면, 우리는 보통 Electron을 업그레이드 하기 전에 한
-달 정도 대기합니다. 이렇게 하면 새로운 Node.js 버전을 업데이트 함으로써 발생하는
-버그들을 피할 수 있습니다. 이러한 상황은 자주 발생합니다.
+새로운 버전의 Node.js가 릴리즈 되면, 보통 Electron을 업그레이드 하기 전에 한 달 정도
+대기합니다. 이렇게 하면 새로운 Node.js 버전을 업데이트 함으로써 발생하는 버그들을
+피할 수 있기 때문입니다. 이러한 상황은 자주 발생합니다.
 
 Node.js의 새로운 기능은 보통 V8 업그레이드에서 가져옵니다. Electron은 Chrome
 브라우저에 탑재된 V8을 사용하고 있습니다. 눈부신 새로운 Node.js 버전의 자바스크립트
diff --git a/docs-translations/ko-KR/styleguide.md b/docs-translations/ko-KR/styleguide.md
index 3896f3d21d10..bf9eba1ee2d6 100644
--- a/docs-translations/ko-KR/styleguide.md
+++ b/docs-translations/ko-KR/styleguide.md
@@ -92,7 +92,7 @@ Returns:
 다음과 같이 사용할 수 있습니다:
 
 ```javascript
-Alarm.on('wake-up', function(time) {
+Alarm.on('wake-up', (time) => {
   console.log(time)
 })
 ```

From 60d7dd991d580ea57aa3a46902dcf9a30e0b1d7e Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Mon, 9 May 2016 16:23:11 +0900
Subject: [PATCH 065/510] :memo: Fix small typos

[ci skip]
---
 docs-translations/ko-KR/api/app.md            | 14 +++++++-------
 docs-translations/ko-KR/api/browser-window.md |  2 +-
 docs-translations/ko-KR/api/web-contents.md   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs-translations/ko-KR/api/app.md b/docs-translations/ko-KR/api/app.md
index a64245688780..2df0c760c4d4 100644
--- a/docs-translations/ko-KR/api/app.md
+++ b/docs-translations/ko-KR/api/app.md
@@ -41,7 +41,7 @@ Electron은 먼저 모든 윈도우의 종료를 시도하고 `will-quit` 이벤
 않습니다.
 
 **역주:** 이 이벤트는 말 그대로 현재 어플리케이션에서 윈도우만 완전히 종료됬을 때
-발생하는 이벤트 입니다. 따라서 어플리케이션을 완전히 종료하려면 이 이벤트에서
+발생하는 이벤트입니다. 따라서 어플리케이션을 완전히 종료하려면 이 이벤트에서
 `app.quit()`를 호출해 주어야 합니다.
 
 ### Event: 'before-quit'
@@ -60,7 +60,7 @@ Returns:
 
 * `event` Event
 
-모든 윈도우들이 종료되고 어플리케이션이 종료되기 시작할 때 발생하는 이벤트 입니다.
+모든 윈도우들이 종료되고 어플리케이션이 종료되기 시작할 때 발생하는 이벤트입니다.
 `event.preventDefault()` 호출을 통해 어플리케이션의 종료를 방지할 수 있습니다.
 
 `will-quit` 와 `window-all-closed` 이벤트의 차이점을 확인하려면 `window-all-close`
@@ -114,7 +114,7 @@ Returns:
 * `event` Event
 * `hasVisibleWindows` Boolean
 
-어플리케이션이 활성화 되었을 때 발생하는 이벤트 입니다. 이 이벤트는 사용자가
+어플리케이션이 활성화 되었을 때 발생하는 이벤트입니다. 이 이벤트는 사용자가
 어플리케이션의 dock 아이콘을 클릭했을 때 주로 발생합니다.
 
 ### Event: 'continue-activity' _OS X_
@@ -142,7 +142,7 @@ Returns:
 * `event` Event
 * `window` BrowserWindow
 
-[browserWindow](browser-window.md)에 대한 포커스가 사라졌을 때 발생하는 이벤트 입니다.
+[browserWindow](browser-window.md)에 대한 포커스가 사라졌을 때 발생하는 이벤트입니다.
 
 ### Event: 'browser-window-focus'
 
@@ -151,7 +151,7 @@ Returns:
 * `event` Event
 * `window` BrowserWindow
 
-[browserWindow](browser-window.md)에 대한 포커스가 발생했을 때 발생하는 이벤트 입니다.
+[browserWindow](browser-window.md)에 대한 포커스가 발생했을 때 발생하는 이벤트입니다.
 
 **역주:** _포커스_ 는 창을 클릭해서 활성화 시켰을 때를 말합니다.
 
@@ -162,7 +162,7 @@ Returns:
 * `event` Event
 * `window` BrowserWindow
 
-새로운 [browserWindow](browser-window.md)가 생성되었을 때 발생하는 이벤트 입니다.
+새로운 [browserWindow](browser-window.md)가 생성되었을 때 발생하는 이벤트입니다.
 
 ### Event: 'certificate-error'
 
@@ -205,7 +205,7 @@ Returns:
   * `issuerName` String - 발급자의 공통 이름
 * `callback` Function
 
-클라이언트 인증이 요청되었을 때 발생하는 이벤트 입니다.
+클라이언트 인증이 요청되었을 때 발생하는 이벤트입니다.
 
 `url`은 클라이언트 인증서를 요청하는 탐색 항목에 해당합니다.
 그리고 `callback`은 목록에서 필터링된 항목과 함께 호출될 필요가 있습니다.
diff --git a/docs-translations/ko-KR/api/browser-window.md b/docs-translations/ko-KR/api/browser-window.md
index 23f1c26ba752..7cb53df4c959 100644
--- a/docs-translations/ko-KR/api/browser-window.md
+++ b/docs-translations/ko-KR/api/browser-window.md
@@ -194,7 +194,7 @@ Returns:
 
 * `event` Event
 
-문서의 제목이 변경될 때 발생하는 이벤트 입니다. `event.preventDefault()`를 호출하여
+문서의 제목이 변경될 때 발생하는 이벤트입니다. `event.preventDefault()`를 호출하여
 네이티브 윈도우의 제목이 변경되는 것을 방지할 수 있습니다.
 
 ### Event: 'close'
diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index 7962b4e439b7..079141c10252 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -226,7 +226,7 @@ Returns:
   * `issuerName` String - 인증서 발급자 이름
 * `callback` Function
 
-클라이언트 인증이 요청되었을 때 발생하는 이벤트 입니다.
+클라이언트 인증이 요청되었을 때 발생하는 이벤트입니다.
 
 사용법은 [`app`의 `select-client-certificate` 이벤트](app.md#event-select-client-certificate)와
 같습니다.

From 797b0ddb9a89b0da63fd9fd7ddd765c5f79b9dc2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 20:08:50 +0900
Subject: [PATCH 066/510] Fix exception when refreshing specs window

---
 spec/api-ipc-spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index d865be967844..008a97f3aaca 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -182,6 +182,10 @@ describe('ipc module', function () {
   })
 
   describe('ipc.sendSync', function () {
+    afterEach(function () {
+      ipcMain.removeAllListeners('send-sync-message')
+    })
+
     it('can be replied by setting event.returnValue', function () {
       var msg = ipcRenderer.sendSync('echo', 'test')
       assert.equal(msg, 'test')

From c40fb678903ee90730d5363e4e22d7d2738901e8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 19:17:58 +0900
Subject: [PATCH 067/510] Bump v1.0.0

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 6 +++---
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 9d04617b2098..32d218fa768c 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>0.37.8</string>
+  <string>1.0.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.37.8</string>
+  <string>1.0.0</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 9f74c14d4461..6163c1ffce6b 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,37,8,0
- PRODUCTVERSION 0,37,8,0
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "0.37.8"
+            VALUE "FileVersion", "1.0.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "0.37.8"
+            VALUE "ProductVersion", "1.0.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 4ce73bc0aeec..561341cfaeab 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -5,9 +5,9 @@
 #ifndef ATOM_VERSION_H
 #define ATOM_VERSION_H
 
-#define ATOM_MAJOR_VERSION 0
-#define ATOM_MINOR_VERSION 37
-#define ATOM_PATCH_VERSION 8
+#define ATOM_MAJOR_VERSION 1
+#define ATOM_MINOR_VERSION 0
+#define ATOM_PATCH_VERSION 0
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index 66ff2fd5baf8..651fc9119e5f 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '0.37.8',
+    'version%': '1.0.0',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index 7d40098f099a..fba4b8befe21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "0.37.8",
+  "version": "1.0.0",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From ab3122ef2a3575ac2d4eabb60f1b58366f70cf95 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 09:22:03 +0900
Subject: [PATCH 068/510] No need to keep the deprecated APIs

They will be removed in next release.
---
 lib/browser/api/protocol.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/lib/browser/api/protocol.js b/lib/browser/api/protocol.js
index 2507acddc83d..931e40e4b8c0 100644
--- a/lib/browser/api/protocol.js
+++ b/lib/browser/api/protocol.js
@@ -1,16 +1,5 @@
 const app = require('electron').app
 const {createProtocolObject, registerStandardSchemes} = process.atomBinding('protocol')
-let protocol = null
-
-// Warn about removed APIs.
-var logAndThrow = function (callback, message) {
-  console.error(message)
-  if (callback) {
-    return callback(new Error(message))
-  } else {
-    throw new Error(message)
-  }
-}
 
 exports.registerStandardSchemes = function (schemes) {
   if (app.isReady()) {
@@ -20,20 +9,7 @@ exports.registerStandardSchemes = function (schemes) {
 }
 
 app.once('ready', function () {
-  protocol = createProtocolObject()
-  // Be compatible with old APIs.
-  protocol.registerProtocol = function (scheme, handler, callback) {
-    return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
-  }
-
-  protocol.isHandledProtocol = function (scheme, callback) {
-    return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.')
-  }
-
-  protocol.interceptProtocol = function (scheme, handler, callback) {
-    return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
-  }
-
+  let protocol = createProtocolObject()
   for (let method in protocol) {
     exports[method] = protocol[method].bind(protocol)
   }

From 566bb1f7086767d1172bf8bfff3b5277e4fdaed6 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 09:49:28 +0900
Subject: [PATCH 069/510] Turn the exception in
 protocol.registerStandardSchemes to warning

---
 lib/browser/api/protocol.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/browser/api/protocol.js b/lib/browser/api/protocol.js
index 931e40e4b8c0..b146931a2b48 100644
--- a/lib/browser/api/protocol.js
+++ b/lib/browser/api/protocol.js
@@ -1,9 +1,10 @@
-const app = require('electron').app
+const {app} = require('electron')
 const {createProtocolObject, registerStandardSchemes} = process.atomBinding('protocol')
 
 exports.registerStandardSchemes = function (schemes) {
   if (app.isReady()) {
-    throw new Error('protocol.registerStandardSchemes should be called before app is ready')
+    console.warn('protocol.registerStandardSchemes should be called before app is ready')
+    return
   }
   registerStandardSchemes(schemes)
 }

From 4dc431043fb54fac5bc0c4019b5b9c96ddd4e7e8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 10:20:08 +0900
Subject: [PATCH 070/510] docs: When to use protocol.registerStandardSchemes

---
 docs/api/protocol.md | 62 ++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/docs/api/protocol.md b/docs/api/protocol.md
index ab0bd7578894..18ce612d02f1 100644
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -6,22 +6,21 @@ An example of implementing a protocol that has the same effect as the
 `file://` protocol:
 
 ```javascript
-const electron = require('electron');
-const { app, protocol } = electron;
-const path = require('path');
+const {app, protocol} = require('electron')
+const path = require('path')
 
-app.on('ready', function() {
-    protocol.registerFileProtocol('atom', function(request, callback) {
-      const url = request.url.substr(7);
-      callback({path: path.normalize(__dirname + '/' + url)});
-    }, function (error) {
-      if (error)
-        console.error('Failed to register protocol')
-    });
-});
+app.on('ready', function () {
+  protocol.registerFileProtocol('atom', function (request, callback) {
+    const url = request.url.substr(7)
+    callback({path: path.normalize(__dirname + '/' + url)})
+  }, function (error) {
+    if (error)
+      console.error('Failed to register protocol')
+  })
+})
 ```
-**Note:** All methods unless specified can only be used after the `ready`
-event in the `app` module is emitted.
+**Note:** All methods unless specified can only be used after the `ready` event
+of the `app` module gets emitted.
 
 ## Methods
 
@@ -31,13 +30,36 @@ The `protocol` module has the following methods:
 
 * `schemes` Array - Custom schemes to be registered as standard schemes.
 
-A standard `scheme` adheres to what RFC 3986 calls
-[generic URI syntax](https://tools.ietf.org/html/rfc3986#section-3). This
-includes `file:`, `filesystem:`, `http` etc. Registering a scheme as standard, will
-allow relative and absolute resources to be resolved correctly when served.
+A standard scheme adheres to what RFC 3986 calls [generic URI
+syntax](https://tools.ietf.org/html/rfc3986#section-3). For example `http` and
+`https` are standard schemes, while `file` is not.
 
-**Note:** This method can only be used before the `ready` event in the
-`app` module is emitted.
+Registering a scheme as standard, will allow relative and absolute resources to
+be resolved correctly when served. Otherwise the scheme will behave like the
+`file` protocol, but without the ability to resolve relative URLs.
+
+For example when you load following page with custom protocol without
+registering it as standard scheme, the image will not be loaded because
+non-standard schemes can not recognize relative URLs:
+
+```html
+<body>
+  <img src='test.png'>
+</body>
+```
+
+So if you want to register a custom protocol to replace the `http` protocol, you
+have to register it as standard scheme:
+
+```javascript
+protocol.registerStandardSchemes(['atom'])
+app.on('ready', function () {
+  protocol.registerHttpProtocol('atom', ...)
+})
+```
+
+**Note:** This method can only be used before the `ready` event of the `app`
+module gets emitted.
 
 ### `protocol.registerServiceWorkerSchemes(schemes)`
 

From 8e7a5adc60db8efc2454144ee557dc9db5da85c7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 09:57:13 +0900
Subject: [PATCH 071/510] spec: protocol.registerStandardSchemes does not throw

---
 spec/api-protocol-spec.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
index cfbbc6608e06..2a1d158c3dfd 100644
--- a/spec/api-protocol-spec.js
+++ b/spec/api-protocol-spec.js
@@ -841,12 +841,6 @@ describe('protocol module', function () {
       })
     })
 
-    it('throws when called after ready event', function () {
-      assert.throws(function () {
-        protocol.registerStandardSchemes(['some-scheme'])
-      }, 'protocol.registerStandardSchemes should be called before app is ready')
-    })
-
     it('resolves relative resources', function (done) {
       var handler = function (request, callback) {
         if (request.url === imageURL) {

From 12e62746b383ca4f51cea2c32611128d96f4f282 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 10 May 2016 13:48:26 +0900
Subject: [PATCH 072/510] :memo: Add `security.md`

[ci skip]
---
 docs-translations/ko-KR/tutorial/security.md | 70 ++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 docs-translations/ko-KR/tutorial/security.md

diff --git a/docs-translations/ko-KR/tutorial/security.md b/docs-translations/ko-KR/tutorial/security.md
new file mode 100644
index 000000000000..2466efe65ac3
--- /dev/null
+++ b/docs-translations/ko-KR/tutorial/security.md
@@ -0,0 +1,70 @@
+# 보안, 네이티브 호환성, 그리고 신뢰성
+
+웹 개발자로써, 우리는 일반적으로 브라우저의 강력한 웹 보안을 잘 이용해왔습니다 - 작성한
+코드에 관련된 보안 문제는 아주 적었습니다. 웹 사이트에 대해 상당히 제한된 권한과 기능에
+의존해왔습니다 - 그리고 사용자들이 새로운 보안 위협에 대해 발 빠르게 대응할 수 있는
+아주 커다란 팀의 엔지니어들에 의해 만들어진 브라우저를 마음 놓고 즐길 것이라고
+믿어왔습니다.
+
+하지만 Electron을 사용하여 작업한다면, Electron은 웹 브라우저가 아니라는 것을 이해하는
+것이 중요합니다. Electron은 웹 기술을 사용하여 강력한 데스크톱 어플리케이션을 만들 수
+있도록 해줍니다. 가장 핵심 기능은 바로 제한된 웹 사이트의 기능을 커버할 정도로 완전한
+네이티브 어플리케이션과 동일한 기능을 하는 강력한 소프트웨어를 만들 수 있는 능력입니다.
+하지만 코드에 부여된 추가적인 기능만큼 고유한 보안 문제가 발생할 수 있습니다.
+
+이를 염두해두고, 신뢰할 수 없는 출처의 임의의 콘텐츠를 표시할 때 Electron에서
+자체적으로 처리하지 않는 심각한 보안 문제를 야기할 수 있다는 점을 주의해야 합니다.
+실제로도, 가장 유명한 Electron 어플리케이션들은 (Atom, Slack, Visual Studio Code,
+등) 주로 로컬 콘텐츠를 (또는 Node 통합이 제외된 신뢰된, 보안된 원격 콘텐츠) 사용합니다
+- 만약 어플리케이션이 온라인 출처에서 가져온 코드를 실행한다면, 그 코드가 악성 코드가
+아닌지 판별하는 것은 본인의 책임입니다.
+
+## Chromium 보안 문제와 업그레이드
+
+Electron이 새로운 버전의 Chromium을 가능한 한 빠르게 지원하려고 노력하지만,
+개발자는 이러한 업그레이딩 작업은 매우 힘든 작업이라는 것을 알아야 합니다 - 각 관련된
+수십에서 심지어 백자리 개수의 파일들을 손수 수정해야 합니다. 주어진 자원과 현재
+기여도를 생각한다면, Electron은 항상 최신 버전의 Chromium을 유지하지 못할 수 있으며,
+며칠부터 몇 주까지 더 걸릴 수 있습니다.
+
+현재 Chromium 구성 요소를 업데이트하는 시스템은 우리가 사용할 수 있는 자원과 이
+프레임워크를 기반으로 구축된 대부분의 어플리케이션이 요구하는 것 사이에서 적절한 균형을
+유지하고 있다고 느끼고 있습니다. 우리는 확실히 Electron 위에 무언가를 만드는 사람들의
+사용 사례에 대한 자세한 내용을 듣는 것에 관심이 있습니다. 이러한 노력을 지원하는 Pull
+request와 기여는 언제나 환영합니다.
+
+## 위 조언 무시하기
+
+원격 위치에서 받아온 코드를 로컬에서 실행하는 경우 언제나 보안 문제가 존재합니다.
+예를 들어, 원격 웹 사이트가 브라우저 윈도우에서 표시될 때를 생각해볼 때, 만약 공격자가
+어떠한 방법으로 웹 페이지의 콘텐츠를 변경하는 경우 (소스를 직접적으로 공격하거나
+어플리케이션과 실질적인 위치 사이에서 공격하는 등), 공갹자는 사용자의 기기에서 네이티브
+코드를 실행할 수 있습니다.
+
+> :warning: 어떠한 상황에서도 원격 코드를 로드하고 실행할 땐 Node 통합 기능을
+비활성화하고, 로컬 파일만 (어플리케이션 패키지 내부에 포함된) Node 코드를 실행시킬 수
+있도록 하는 것이 좋습니다. 원격 콘텐츠를 표시할 땐, 항상 `webview`를 사용하고
+`nodeIntegration`이 비활성화되어있는지 확인하세요.
+
+#### 체크 리스트
+
+이 리스트는 완벽하지 않습니다, 하지만 최소한 다음 사항은 확인하는 것이 좋습니다:
+
+* 보안된 (https) 콘텐츠만 표시합니다.
+* 원격 콘텐츠를 표시하는 모든 렌더러에서 Node 통합 기능을 비활성화합니다.
+  (`webPreferences` 사용)
+* `webSecurity`를 비활성화하지 않습니다. 이 옵션을 비활성화하면 동일-출처 정책도
+  비활성화됩니다.
+* `allowDisplayingInsecureContent`를 `true`로 설정하지 마세요.
+* `allowRunningInsecureContent`를 `true`로 설정하지 마세요.
+* 무엇을 하고 있는지 확실히 알고 있지않는 이상 `experimentalFeatures` 또는
+  `experimentalCanvasFeatures`를 활성화하지 마세요.
+* 무엇을 하고 있는지 확실히 알고 있지않는 이상 `blinkFeatures`를 활성화하지 마세요.
+* WebViews: `nodeintegration`를 `false`로 설정하세요.
+* WebViews: `disablewebsecurity`를 사용하지 마세요.
+* WebViews: `allowpopups`를 사용하지 마세요.
+* WebViews: 원격 CSS/JS와 `insertCSS` 또는 `executeJavaScript`를 함께 사용하지
+  마세요.
+
+다시 말하지만, 이 리스트는 그저 위험을 최소화할 뿐이며 완전히 제거하지 않습니다. 만약
+목적이 그저 웹 사이트를 보여주는 것이라면 일반 웹 브라우저가 더 안전한 방법입니다.

From 3014e61792168492d481cace524cf74829f5529d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 16:10:02 +0900
Subject: [PATCH 073/510] Update native_mate: close #5392

---
 vendor/native_mate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/native_mate b/vendor/native_mate
index 0df2d882ea22..ea07d4c6c89d 160000
--- a/vendor/native_mate
+++ b/vendor/native_mate
@@ -1 +1 @@
-Subproject commit 0df2d882ea2286e6335f206b7002037fce66c4a5
+Subproject commit ea07d4c6c89d8d460e76b2d2ab9b0ebc51f9a432

From 6bad16377decd93d4c376f7c2763826a664b1b5b Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 10 May 2016 16:27:14 +0900
Subject: [PATCH 074/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/api/app.md            | 12 ++--
 docs-translations/ko-KR/api/browser-window.md | 10 +--
 .../ko-KR/api/chrome-command-line-switches.md |  4 +-
 docs-translations/ko-KR/api/clipboard.md      |  4 +-
 .../ko-KR/api/content-tracing.md              |  6 +-
 docs-translations/ko-KR/api/crash-reporter.md |  2 +-
 .../ko-KR/api/desktop-capturer.md             |  4 +-
 docs-translations/ko-KR/api/dialog.md         |  4 +-
 docs-translations/ko-KR/api/download-item.md  |  8 +--
 docs-translations/ko-KR/api/file-object.md    | 10 +--
 .../ko-KR/api/frameless-window.md             |  8 +--
 .../ko-KR/api/global-shortcut.md              |  9 ++-
 docs-translations/ko-KR/api/ipc-main.md       | 10 +--
 docs-translations/ko-KR/api/menu.md           | 37 ++++++-----
 docs-translations/ko-KR/api/native-image.md   |  8 +--
 docs-translations/ko-KR/api/power-monitor.md  |  4 +-
 .../ko-KR/api/power-save-blocker.md           |  4 +-
 docs-translations/ko-KR/api/process.md        |  4 +-
 docs-translations/ko-KR/api/protocol.md       | 58 ++++++++++++------
 docs-translations/ko-KR/api/remote.md         | 41 ++++++-------
 docs-translations/ko-KR/api/screen.md         | 27 ++++----
 docs-translations/ko-KR/api/session.md        | 32 +++++-----
 docs-translations/ko-KR/api/shell.md          |  3 +-
 docs-translations/ko-KR/api/synopsis.md       | 33 ++++++----
 .../ko-KR/api/system-preferences.md           |  2 +-
 docs-translations/ko-KR/api/tray.md           | 12 ++--
 docs-translations/ko-KR/api/web-contents.md   | 61 ++++++++++---------
 docs-translations/ko-KR/api/web-frame.md      |  2 +-
 docs-translations/ko-KR/api/web-view-tag.md   | 38 ++++++------
 docs-translations/ko-KR/faq/electron-faq.md   | 10 +--
 .../ko-KR/tutorial/application-packaging.md   |  8 +--
 .../desktop-environment-integration.md        | 21 ++++---
 .../ko-KR/tutorial/online-offline-events.md   | 20 +++---
 .../ko-KR/tutorial/quick-start.md             | 35 ++++++-----
 .../tutorial/using-pepper-flash-plugin.md     |  4 +-
 .../tutorial/using-selenium-and-webdriver.md  | 42 ++++++-------
 .../tutorial/using-widevine-cdm-plugin.md     |  4 +-
 37 files changed, 314 insertions(+), 287 deletions(-)

diff --git a/docs-translations/ko-KR/api/app.md b/docs-translations/ko-KR/api/app.md
index 2df0c760c4d4..4b747d0b1b56 100644
--- a/docs-translations/ko-KR/api/app.md
+++ b/docs-translations/ko-KR/api/app.md
@@ -5,8 +5,8 @@
 밑의 예시는 마지막 윈도우가 종료되었을 때, 어플리케이션을 종료시키는 예시입니다:
 
 ```javascript
-const app = require('electron').app;
-app.on('window-all-closed', function() {
+const { app } = require('electron');
+app.on('window-all-closed', () => {
   app.quit();
 });
 ```
@@ -244,7 +244,7 @@ Returns:
 `callback(username, password)` 형태의 콜백을 호출하여 인증을 처리해야 합니다.
 
 ```javascript
-app.on('login', function(event, webContents, request, authInfo, callback) {
+app.on('login', (event, webContents, request, authInfo, callback) => {
   event.preventDefault();
   callback('username', 'secret');
 })
@@ -486,9 +486,9 @@ OS X에선 사용자가 Finder에서 어플리케이션의 두 번째 인스턴
 인스턴스의 윈도우를 활성화 시키는 예시입니다:
 
 ```javascript
-var myWindow = null;
+let myWindow = null;
 
-var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
+const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => {
   // 어플리케이션을 중복 실행했습니다. 주 어플리케이션 인스턴스를 활성화 합니다.
   if (myWindow) {
     if (myWindow.isMinimized()) myWindow.restore();
@@ -503,7 +503,7 @@ if (shouldQuit) {
 }
 
 // 윈도우를 생성하고 각종 리소스를 로드하고 작업합니다.
-app.on('ready', function() {
+app.on('ready', () => {
 });
 ```
 
diff --git a/docs-translations/ko-KR/api/browser-window.md b/docs-translations/ko-KR/api/browser-window.md
index 7cb53df4c959..321439f84930 100644
--- a/docs-translations/ko-KR/api/browser-window.md
+++ b/docs-translations/ko-KR/api/browser-window.md
@@ -6,13 +6,13 @@
 
 ```javascript
 // 메인 프로세스에서
-const BrowserWindow = require('electron').BrowserWindow;
+const { BrowserWindow } = require('electron');
 
 // 또는 렌더러 프로세스에서
-const BrowserWindow = require('electron').remote.BrowserWindow;
+const { BrowserWindow } = require('electron').remote;
 
-var win = new BrowserWindow({ width: 800, height: 600, show: false });
-win.on('closed', function() {
+let win = new BrowserWindow({ width: 800, height: 600, show: false });
+win.on('closed', () => {
   win = null;
 });
 
@@ -318,7 +318,7 @@ Returns:
 e.g. `APPCOMMAND_BROWSER_BACKWARD` 는 `browser-backward`와 같이 반환됩니다.
 
 ```javascript
-someWindow.on('app-command', function(e, cmd) {
+someWindow.on('app-command', (e, cmd) => {
   // 마우스의 뒤로가기 버튼을 눌렀을 때 뒤로가기 탐색을 실행합니다
   if (cmd === 'browser-backward' && someWindow.webContents.canGoBack()) {
     someWindow.webContents.goBack();
diff --git a/docs-translations/ko-KR/api/chrome-command-line-switches.md b/docs-translations/ko-KR/api/chrome-command-line-switches.md
index 7f1f4ced6166..1b5f672fa5a8 100644
--- a/docs-translations/ko-KR/api/chrome-command-line-switches.md
+++ b/docs-translations/ko-KR/api/chrome-command-line-switches.md
@@ -7,11 +7,11 @@
 명령줄 옵션을 추가로 지정할 수 있습니다:
 
 ```javascript
-const app = require('electron').app;
+const { app } = require('electron');
 app.commandLine.appendSwitch('remote-debugging-port', '8315');
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1');
 
-app.on('ready', function() {
+app.on('ready', () => {
   // Your code here
 });
 ```
diff --git a/docs-translations/ko-KR/api/clipboard.md b/docs-translations/ko-KR/api/clipboard.md
index 0590713e83b3..8f48c6f579f0 100644
--- a/docs-translations/ko-KR/api/clipboard.md
+++ b/docs-translations/ko-KR/api/clipboard.md
@@ -2,8 +2,10 @@
 
 > 시스템 클립보드에 복사와 붙여넣기를 수행합니다.
 
+다음 예시는 클립보드에 문자열을 쓰는 방법을 보여줍니다:
+
 ```javascript
-const clipboard = require('electron').clipboard;
+const { clipboard } = require('electron');
 clipboard.writeText('Example String');
 ```
 
diff --git a/docs-translations/ko-KR/api/content-tracing.md b/docs-translations/ko-KR/api/content-tracing.md
index ac923ee9fe90..204ed20622d9 100644
--- a/docs-translations/ko-KR/api/content-tracing.md
+++ b/docs-translations/ko-KR/api/content-tracing.md
@@ -7,7 +7,7 @@
 `chrome://tracing/` 페이지를 열고 생성된 파일을 로드하면 결과를 볼 수 있습니다.
 
 ```javascript
-const contentTracing = require('electron').contentTracing;
+const { contentTracing } = require('electron');
 
 const options = {
   categoryFilter: '*',
@@ -17,8 +17,8 @@ const options = {
 contentTracing.startRecording(options, function() {
   console.log('Tracing started');
 
-  setTimeout(function() {
-    contentTracing.stopRecording('', function(path) {
+  setTimeout(() => {
+    contentTracing.stopRecording('', (path) => {
       console.log('Tracing data recorded to ' + path);
     });
   }, 5000);
diff --git a/docs-translations/ko-KR/api/crash-reporter.md b/docs-translations/ko-KR/api/crash-reporter.md
index 90851f7ee5bd..f4e674132ab2 100644
--- a/docs-translations/ko-KR/api/crash-reporter.md
+++ b/docs-translations/ko-KR/api/crash-reporter.md
@@ -5,7 +5,7 @@
 다음 예시는 윈격 서버에 어플리케이션 크래시 정보를 자동으로 보고하는 예시입니다:
 
 ```javascript
-const crashReporter = require('electron').crashReporter;
+const { crashReporter } = require('electron');
 
 crashReporter.start({
   productName: 'YourName',
diff --git a/docs-translations/ko-KR/api/desktop-capturer.md b/docs-translations/ko-KR/api/desktop-capturer.md
index 0ee1b3e1d229..6135ca500d5b 100644
--- a/docs-translations/ko-KR/api/desktop-capturer.md
+++ b/docs-translations/ko-KR/api/desktop-capturer.md
@@ -5,9 +5,9 @@
 
 ```javascript
 // 렌더러 프로세스 내부
-var desktopCapturer = require('electron').desktopCapturer;
+const { desktopCapturer } = require('electron');
 
-desktopCapturer.getSources({types: ['window', 'screen']}, function(error, sources) {
+desktopCapturer.getSources({types: ['window', 'screen']}, (error, sources) => {
   if (error) throw error;
   for (var i = 0; i < sources.length; ++i) {
     if (sources[i].name == "Electron") {
diff --git a/docs-translations/ko-KR/api/dialog.md b/docs-translations/ko-KR/api/dialog.md
index 2110e376c27c..7282f5888c88 100644
--- a/docs-translations/ko-KR/api/dialog.md
+++ b/docs-translations/ko-KR/api/dialog.md
@@ -6,7 +6,7 @@
 
 ```javascript
 var win = ...;  // 대화 상자를 사용할 BrowserWindow 객체
-const dialog = require('electron').dialog;
+const { dialog } = require('electron');
 console.log(dialog.showOpenDialog({ properties: [ 'openFile', 'openDirectory', 'multiSelections' ]}));
 ```
 
@@ -14,7 +14,7 @@ console.log(dialog.showOpenDialog({ properties: [ 'openFile', 'openDirectory', '
 객체를 사용하고 싶다면, `remote`를 통해 접근하는 방법을 고려해야 합니다:
 
 ```javascript
-const dialog = require('electron').remote.dialog;
+const { dialog } = require('electron').remote;
 ```
 
 ## Methods
diff --git a/docs-translations/ko-KR/api/download-item.md b/docs-translations/ko-KR/api/download-item.md
index 4267a41df71d..4de29eb86076 100644
--- a/docs-translations/ko-KR/api/download-item.md
+++ b/docs-translations/ko-KR/api/download-item.md
@@ -8,17 +8,17 @@
 
 ```javascript
 // 메인 프로세스
-win.webContents.session.on('will-download', function(event, item, webContents) {
+win.webContents.session.on('will-download', (event, item, webContents) => {
   // Set the save path, making Electron not to prompt a save dialog.
   item.setSavePath('/tmp/save.pdf');
   console.log(item.getMimeType());
   console.log(item.getFilename());
   console.log(item.getTotalBytes());
-  item.on('updated', function() {
+  item.on('updated', () => {
     console.log('Received bytes: ' + item.getReceivedBytes());
   });
-  item.on('done', function(e, state) {
-    if (state == "completed") {
+  item.on('done', (e, state) => {
+    if (state === "completed") {
       console.log("Download successfully");
     } else {
       console.log("Download is cancelled or interrupted that can't be resumed");
diff --git a/docs-translations/ko-KR/api/file-object.md b/docs-translations/ko-KR/api/file-object.md
index 6d7519a7ad2c..898f7f75b82d 100644
--- a/docs-translations/ko-KR/api/file-object.md
+++ b/docs-translations/ko-KR/api/file-object.md
@@ -14,16 +14,16 @@ API를 사용하여 작업할 때 선택된 파일의 경로를 알 수 있도
 </div>
 
 <script>
-  var holder = document.getElementById('holder');
-  holder.ondragover = function () {
+  const holder = document.getElementById('holder');
+  holder.ondragover = () => {
     return false;
   };
-  holder.ondragleave = holder.ondragend = function () {
+  holder.ondragleave = holder.ondragend = () => {
     return false;
   };
-  holder.ondrop = function (e) {
+  holder.ondrop = (e) => {
     e.preventDefault();
-    var file = e.dataTransfer.files[0];
+    const file = e.dataTransfer.files[0];
     console.log('File you dragged here is', file.path);
     return false;
   };
diff --git a/docs-translations/ko-KR/api/frameless-window.md b/docs-translations/ko-KR/api/frameless-window.md
index 199c3dcbd9f4..95c0294b1357 100644
--- a/docs-translations/ko-KR/api/frameless-window.md
+++ b/docs-translations/ko-KR/api/frameless-window.md
@@ -13,8 +13,8 @@ Frameless Window를 만드려면 [BrowserWindow](browser-window.md) 객체의
 `options` 객체에서 `frame` 옵션을 `false`로 지정하면 됩니다:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
-var win = new BrowserWindow({ width: 800, height: 600, frame: false });
+const { BrowserWindow } = require('electron');
+let win = new BrowserWindow({ width: 800, height: 600, frame: false });
 ```
 
 ### 최신 OS X에서 사용할 수 있는 대안
@@ -25,7 +25,7 @@ OS X 10.10 Yosemite 이후의 최신 버전부터는 테두리가 없는 창을
 ("흔히 신호등으로 알고 있는")의 기능과 창 크기를 그대로 유지할 수 있습니다:
 
 ```javascript
-var win = new BrowserWindow({ 'titleBarStyle': 'hidden' });
+let win = new BrowserWindow({ 'titleBarStyle': 'hidden' });
 ```
 
 ## 투명한 창 만들기
@@ -34,7 +34,7 @@ Frameless Window 창의 배경을 투명하게 만들고 싶다면 `transparent`
 바꿔주기만 하면됩니다:
 
 ```javascript
-var win = new BrowserWindow({ transparent: true, frame: false });
+let win = new BrowserWindow({ transparent: true, frame: false });
 ```
 
 ### API의 한계
diff --git a/docs-translations/ko-KR/api/global-shortcut.md b/docs-translations/ko-KR/api/global-shortcut.md
index 71b7ab00163c..3536cf1f4260 100644
--- a/docs-translations/ko-KR/api/global-shortcut.md
+++ b/docs-translations/ko-KR/api/global-shortcut.md
@@ -12,12 +12,11 @@
 
 ```javascript
 const electron = require('electron');
-const app = electron.app;
-const globalShortcut = electron.globalShortcut;
+const { app, globalShortcut } = electron;
 
-app.on('ready', function() {
+app.on('ready', () => {
   // 'CommandOrControl+X' 단축키를 리스너에 등록합니다.
-  var ret = globalShortcut.register('CommandOrControl+X', function() {
+  const ret = globalShortcut.register('CommandOrControl+X', () => {
     console.log('CommandOrControl+X is pressed');
   });
 
@@ -29,7 +28,7 @@ app.on('ready', function() {
   console.log(globalShortcut.isRegistered('CommandOrControl+X'));
 });
 
-app.on('will-quit', function() {
+app.on('will-quit', () => {
   // 단축키의 등록을 해제합니다.
   globalShortcut.unregister('CommandOrControl+X');
 
diff --git a/docs-translations/ko-KR/api/ipc-main.md b/docs-translations/ko-KR/api/ipc-main.md
index 8ae11a99815c..9b9ef83ed9ec 100644
--- a/docs-translations/ko-KR/api/ipc-main.md
+++ b/docs-translations/ko-KR/api/ipc-main.md
@@ -20,13 +20,13 @@
 
 ```javascript
 // 메인 프로세스
-const ipcMain = require('electron').ipcMain;
-ipcMain.on('asynchronous-message', function(event, arg) {
+const { ipcMain } = require('electron');
+ipcMain.on('asynchronous-message', (event, arg) => {
   console.log(arg);  // "ping" 출력
   event.sender.send('asynchronous-reply', 'pong');
 });
 
-ipcMain.on('synchronous-message', function(event, arg) {
+ipcMain.on('synchronous-message', (event, arg) => {
   console.log(arg);  // "ping" 출력
   event.returnValue = 'pong';
 });
@@ -34,10 +34,10 @@ ipcMain.on('synchronous-message', function(event, arg) {
 
 ```javascript
 // 렌더러 프로세스 (웹 페이지)
-const ipcRenderer = require('electron').ipcRenderer;
+const { ipcRenderer } = require('electron');
 console.log(ipc.sendSync('synchronous-message', 'ping')); // "pong" 출력
 
-ipcRenderer.on('asynchronous-reply', function(arg) {
+ipcRenderer.on('asynchronous-reply', (arg) => {
   console.log(arg); // "pong" 출력
 });
 ipcRenderer.send('asynchronous-message', 'ping');
diff --git a/docs-translations/ko-KR/api/menu.md b/docs-translations/ko-KR/api/menu.md
index 30990380d69a..599c3b930d5e 100644
--- a/docs-translations/ko-KR/api/menu.md
+++ b/docs-translations/ko-KR/api/menu.md
@@ -14,16 +14,14 @@
 ```html
 <!-- index.html -->
 <script>
-const remote = require('electron').remote;
-const Menu = remote.Menu;
-const MenuItem = remote.MenuItem;
+const { Menu, MenuItem } = require('electron').remote;
 
-var menu = new Menu();
-menu.append(new MenuItem({ label: 'MenuItem1', click: function() { console.log('item 1 clicked'); } }));
+const menu = new Menu();
+menu.append(new MenuItem({ label: 'MenuItem1', click: () => { console.log('item 1 clicked'); } }));
 menu.append(new MenuItem({ type: 'separator' }));
 menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', checked: true }));
 
-window.addEventListener('contextmenu', function (e) {
+window.addEventListener('contextmenu', (e) => {
   e.preventDefault();
   menu.popup(remote.getCurrentWindow());
 }, false);
@@ -34,7 +32,7 @@ window.addEventListener('contextmenu', function (e) {
 어플리케이션 메뉴를 만듭니다:
 
 ```javascript
-var template = [
+const template = [
   {
     label: 'Edit',
     submenu: [
@@ -79,33 +77,32 @@ var template = [
       {
         label: 'Reload',
         accelerator: 'CmdOrCtrl+R',
-        click: function(item, focusedWindow) {
-          if (focusedWindow)
-            focusedWindow.reload();
+        click: (item, focusedWindow) => {
+          if (focusedWindow) focusedWindow.reload();
         }
       },
       {
         label: 'Toggle Full Screen',
-        accelerator: (function() {
-          if (process.platform == 'darwin')
+        accelerator: (() => {
+          if (process.platform === 'darwin')
             return 'Ctrl+Command+F';
           else
             return 'F11';
         })(),
-        click: function(item, focusedWindow) {
+        click: (item, focusedWindow) => {
           if (focusedWindow)
             focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
         }
       },
       {
         label: 'Toggle Developer Tools',
-        accelerator: (function() {
+        accelerator: (() => {
           if (process.platform == 'darwin')
             return 'Alt+Command+I';
           else
             return 'Ctrl+Shift+I';
         })(),
-        click: function(item, focusedWindow) {
+        click: (item, focusedWindow) => {
           if (focusedWindow)
             focusedWindow.webContents.toggleDevTools();
         }
@@ -134,14 +131,14 @@ var template = [
     submenu: [
       {
         label: 'Learn More',
-        click: function() { require('electron').shell.openExternal('http://electron.atom.io') }
+        click: () => { require('electron').shell.openExternal('http://electron.atom.io') }
       },
     ]
   },
 ];
 
-if (process.platform == 'darwin') {
-  var name = require('electron').remote.app.getName();
+if (process.platform === 'darwin') {
+  const name = require('electron').remote.app.getName();
   template.unshift({
     label: name,
     submenu: [
@@ -180,7 +177,7 @@ if (process.platform == 'darwin') {
       {
         label: 'Quit',
         accelerator: 'Command+Q',
-        click: function() { app.quit(); }
+        click: () => { app.quit(); }
       },
     ]
   });
@@ -196,7 +193,7 @@ if (process.platform == 'darwin') {
   );
 }
 
-var menu = Menu.buildFromTemplate(template);
+const menu = Menu.buildFromTemplate(template);
 Menu.setApplicationMenu(menu);
 ```
 
diff --git a/docs-translations/ko-KR/api/native-image.md b/docs-translations/ko-KR/api/native-image.md
index 95f213924f7f..af67a5bdb50a 100644
--- a/docs-translations/ko-KR/api/native-image.md
+++ b/docs-translations/ko-KR/api/native-image.md
@@ -9,15 +9,15 @@ Electron은 파일 경로 또는 `nativeImage` 인스턴스를 통해 이미지
 전달하여 이미지를 사용할 수 있습니다:
 
 ```javascript
-var appIcon = new Tray('/Users/somebody/images/icon.png');
-var window = new BrowserWindow({icon: '/Users/somebody/images/window.png'});
+const appIcon = new Tray('/Users/somebody/images/icon.png');
+let window = new BrowserWindow({icon: '/Users/somebody/images/window.png'});
 ```
 
 이 예시는 클립보드로부터 가져온 `nativeImage`로 트레이 메뉴를 생성합니다:
 
 ```javascript
-var image = clipboard.readImage();
-var appIcon = new Tray(image);
+const image = clipboard.readImage();
+const appIcon = new Tray(image);
 ```
 
 ## 지원하는 포맷
diff --git a/docs-translations/ko-KR/api/power-monitor.md b/docs-translations/ko-KR/api/power-monitor.md
index d2f1635dfcca..7dd0ed94d9bc 100644
--- a/docs-translations/ko-KR/api/power-monitor.md
+++ b/docs-translations/ko-KR/api/power-monitor.md
@@ -10,8 +10,8 @@
 ```javascript
 var app = require('app');
 
-app.on('ready', function() {
-  require('electron').powerMonitor.on('suspend', function() {
+app.on('ready', () => {
+  require('electron').powerMonitor.on('suspend', () => {
     console.log('절전모드로 진입합니다!');
   });
 });
diff --git a/docs-translations/ko-KR/api/power-save-blocker.md b/docs-translations/ko-KR/api/power-save-blocker.md
index 4a4f85c76c50..878ae26e4462 100644
--- a/docs-translations/ko-KR/api/power-save-blocker.md
+++ b/docs-translations/ko-KR/api/power-save-blocker.md
@@ -5,9 +5,9 @@
 예시:
 
 ```javascript
-const powerSaveBlocker = require('electron').powerSaveBlocker;
+const { powerSaveBlocker } = require('electron');
 
-var id = powerSaveBlocker.start('prevent-display-sleep');
+const id = powerSaveBlocker.start('prevent-display-sleep');
 console.log(powerSaveBlocker.isStarted(id));
 
 powerSaveBlocker.stop(id);
diff --git a/docs-translations/ko-KR/api/process.md b/docs-translations/ko-KR/api/process.md
index bf2a314c72a4..81d308b08b1a 100644
--- a/docs-translations/ko-KR/api/process.md
+++ b/docs-translations/ko-KR/api/process.md
@@ -29,8 +29,8 @@ Electron 내부 초기화 스크립트의 로드가 완료되고, 웹 페이지
 
 ```javascript
 // preload.js
-var _setImmediate = setImmediate;
-var _clearImmediate = clearImmediate;
+const _setImmediate = setImmediate;
+const _clearImmediate = clearImmediate;
 process.once('loaded', function() {
   global.setImmediate = _setImmediate;
   global.clearImmediate = _clearImmediate;
diff --git a/docs-translations/ko-KR/api/protocol.md b/docs-translations/ko-KR/api/protocol.md
index 8c3e2c2934ac..1a9830cc9c2d 100644
--- a/docs-translations/ko-KR/api/protocol.md
+++ b/docs-translations/ko-KR/api/protocol.md
@@ -5,19 +5,18 @@
 다음 예시는 `file://` 프로토콜과 비슷한 일을 하는 커스텀 프로토콜을 설정합니다:
 
 ```javascript
-const electron = require('electron');
-const { app, protocol } = electron;
-const path = require('path');
+const {app, protocol} = require('electron')
+const path = require('path')
 
-app.on('ready', function() {
-    protocol.registerFileProtocol('atom', function(request, callback) {
-      var url = request.url.substr(7);
-      callback({path: path.normalize(__dirname + '/' + url)});
-    }, function (error) {
-      if (error)
-        console.error('Failed to register protocol')
-    });
-});
+app.on('ready', function () {
+  protocol.registerFileProtocol('atom', function (request, callback) {
+    const url = request.url.substr(7)
+    callback({path: path.normalize(__dirname + '/' + url)})
+  }, function (error) {
+    if (error)
+      console.error('Failed to register protocol')
+  })
+})
 ```
 
 **참고:** 모든 메서드는 따로 표기하지 않는 한 `app` 모듈의 `ready` 이벤트가 발생한
@@ -31,10 +30,33 @@ app.on('ready', function() {
 
 * `schemes` Array - 표준 스킴으로 등록할 커스텀 스킴 리스트
 
-표준 `scheme`의 형식은 RFC 3986 [일반 URI 구문](https://tools.ietf.org/html/rfc3986#section-3)
-표준을 따릅니다. 이 형식은 `file:`, `filesystem:`, `http` 등을 포함합니다. 스킴을
-표준을 따라 등록하면, 스킴이 제공될 때 상대, 절대 경로의 리소스를 올바르게 취할 수
-있습니다.
+표준 스킴의 형식은 RFC 3986 [일반 URI 문법](https://tools.ietf.org/html/rfc3986#section-3)
+표준을 따릅니다. 예를 들어 `http`와 `https` 같은 표준 스킴과 `file`과 같은 표준이
+아닌 스킴이 있습니다.
+
+표준 스킴으로 등록하면, 상대, 절대 경로의 리소스를 올바르게 취할 수 있습니다. 다른
+경우엔 스킴이 상대 경로 URL에 대한 분석 기능이 제외된 `file` 프로토콜과 같이
+작동합니다.
+
+예를 들어 다음과 같은 페이지에서 표준 스킴 등록 절차 없이 커스텀 프로토콜을 사용하여
+이미지를 로드하려 했을 때, 표준 스킴으로 등록되지 않은 상대 경로 URL을 인식하지 못하고
+로드에 실패하게 됩니다:
+
+```html
+<body>
+  <img src='test.png'>
+</body>
+```
+
+따라서 커스텀 프로토콜을 등록하여 `http` 프로토콜을 덮어 쓰려면, 표준 스킴으로
+등록해야만 합니다:
+
+```javascript
+protocol.registerStandardSchemes(['atom'])
+app.on('ready', function () {
+  protocol.registerHttpProtocol('atom', ...)
+})
+```
 
 **참고:** 이 메서드는 `app` 모듈의 `ready` 이벤트가 발생하기 이전에만 사용할 수
 있습니다.
@@ -94,9 +116,9 @@ The `uploadData` is an array of `data` objects:
 예시:
 
 ```javascript
-protocol.registerBufferProtocol('atom', function(request, callback) {
+protocol.registerBufferProtocol('atom', (request, callback) => {
   callback({mimeType: 'text/html', data: new Buffer('<h5>Response</h5>')});
-}, function (error) {
+}, (error) => {
   if (error)
     console.error('Failed to register protocol')
 });
diff --git a/docs-translations/ko-KR/api/remote.md b/docs-translations/ko-KR/api/remote.md
index 5e1446b53432..4bca5d83c147 100644
--- a/docs-translations/ko-KR/api/remote.md
+++ b/docs-translations/ko-KR/api/remote.md
@@ -14,8 +14,7 @@ inter-process 통신을 하지 않고도 간단한 API를 통해 직접 메인 
 다음 예시는 렌더러 프로세스에서 브라우저 창을 만드는 예시입니다:
 
 ```javascript
-const remote = require('electron').remote;
-const BrowserWindow = remote.BrowserWindow;
+const { BrowserWindow } = require('electron').remote;
 
 var win = new BrowserWindow({ width: 800, height: 600 });
 win.loadURL('https://github.com');
@@ -57,7 +56,7 @@ Remote 객체가 GC 되려면 대응하는 메인 프로세스 내부 객체의
 받을 수 있습니다. 하지만 이 작업은 반드시 주의를 기울여 사용해야 합니다.
 
 첫째, 데드락을 피하기 위해 메인 프로세스로 전달된 콜백들은 비동기로 호출됩니다. 이러한
-이유로 메인 프로세스로 전달된 콜백들의 반환 값을 내부 함수에서 언제나 정상적으로 받을
+이유로 메인 프로세스에 전달된 콜백의 반환 값을 내부 함수에서 언제나 정상적으로 받을
 것이라고 예측해선 안됩니다.
 
 예를 들어 메인 프로세스에서 `Array.map` 같은 메서드를 사용할 때 렌더러 프로세스에서
@@ -65,54 +64,50 @@ Remote 객체가 GC 되려면 대응하는 메인 프로세스 내부 객체의
 
 ```javascript
 // mapNumbers.js 메인 프로세스
-exports.withRendererCallback = function(mapper) {
+exports.withRendererCallback = (mapper) => {
   return [1,2,3].map(mapper);
 }
 
-exports.withLocalCallback = function() {
-  return exports.mapNumbers(function(x) {
-    return x + 1;
-  });
+exports.withLocalCallback = () => {
+  return exports.mapNumbers(x => x + 1);
 }
 ```
 
 ```javascript
 // 렌더러 프로세스
-var mapNumbers = require("remote").require("./mapNumbers");
+const mapNumbers = require("remote").require("./mapNumbers");
 
-var withRendererCb = mapNumbers.withRendererCallback(function(x) {
-  return x + 1;
-})
+const withRendererCb = mapNumbers.withRendererCallback(x => x + 1);
 
-var withLocalCb = mapNumbers.withLocalCallback()
+const withLocalCb = mapNumbers.withLocalCallback()
 
 console.log(withRendererCb, withLocalCb) // [true, true, true], [2, 3, 4]
 ```
 
-보다시피 렌더러 콜백의 동기 반환 값은 예상되지 않은 처리입니다.
-그리고 메인 프로세스에서 처리한 함수의 반환 값과 일치하지 않습니다.
+보다시피 동기적인 렌더러 콜백 함수의 반환 값은 예상되지 않은 값입니다. 그리고 메인
+프로세스에서 처리한 함수의 반환 값과 일치하지 않습니다.
 
 둘째, 콜백들은 메인 프로세스로 전달, 호출된 이후에도 자동으로 함수의 참조가 릴리즈 되지
 않습니다. 함수 참조는 메인 프로세스에서 GC가 일어나기 전까지 계속 프로세스에 남아있게
 됩니다.
 
 다음 코드를 보면 느낌이 올 것입니다. 이 예시는 remote 객체에 `close` 이벤트 콜백을
-설치합니다:
+등록합니다:
 
 ```javascript
-var remote = require('remote');
+const remote = require('remote');
 
-remote.getCurrentWindow().on('close', function() {
+remote.getCurrentWindow().on('close', () => {
   // blabla...
 });
 ```
 
-하지만 이 코드 처럼 이벤트를 명시적으로 제거하지 않는 이상 콜백 함수의 참조가 계속해서
-메인 프로세스에 남아있게 됩니다. 만약 명시적으로 콜백을 제거하지 않으면 매 번 창을
-새로고침 할 때마다 콜백을 새로 설치합니다. 게다가 이전 콜백이 제거되지 않고 계속해서
-쌓이면서 메모리 누수가 발생합니다.
+하지만 이 코드와 같이 등록된 이벤트는 명시적으로 제거하지 않는 이상 콜백 함수의 참조가
+계속해서 메인 프로세스에 남아있게 됩니다. 만약 명시적으로 콜백을 제거하지 않으면 매 번
+창을 새로고침 할 때마다 콜백을 새로 설치합니다. 게다가 이전 콜백이 제거되지 않고
+계속해서 쌓이면서 메모리 누수가 발생합니다.
 
-설상가상으로 이전에 설치된 콜백의 콘텍스트가 릴리즈 되고 난 후(예: 페이지 새로고침)
+설상가상으로 이전에 등록된 콜백의 콘텍스트가 릴리즈 되고 난 후 (e.g. 페이지 새로고침)
 `close` 이벤트가 발생하면 예외가 발생하고 메인 프로세스가 작동 중지됩니다.
 
 이러한 문제를 피하려면 렌더러 프로세스에서 메인 프로세스로 넘긴 함수의 참조를 사용 후
diff --git a/docs-translations/ko-KR/api/screen.md b/docs-translations/ko-KR/api/screen.md
index 4d66a885d524..5506f35e612a 100644
--- a/docs-translations/ko-KR/api/screen.md
+++ b/docs-translations/ko-KR/api/screen.md
@@ -16,31 +16,28 @@
 
 ```javascript
 const electron = require('electron');
-const app = electron.app;
-const BrowserWindow = electron.BrowserWindow;
+const { app, BrowserWindow } = electron;
 
-var mainWindow;
+let mainWindow;
 
-app.on('ready', function() {
-  var electronScreen = electron.screen;
-  var size = electronScreen.getPrimaryDisplay().workAreaSize;
-  mainWindow = new BrowserWindow({ width: size.width, height: size.height });
+app.on('ready', () => {
+  const { width, height } = electron.screen.getPrimaryDisplay().workAreaSize;
+  mainWindow = new BrowserWindow({ width, height });
 });
 ```
 
 다음 예시는 확장 디스플레이에 윈도우를 생성합니다:
 
 ```javascript
-var app = require('app');
-var BrowserWindow = require('browser-window');
+const electron = require('electron');
+const { screen: electronScreen, app, BrowserWindow } = electron;
 
-var mainWindow;
+let mainWindow;
 
-app.on('ready', function() {
-  var electronScreen = require('screen');
-  var displays = electronScreen.getAllDisplays();
-  var externalDisplay = null;
-  for (var i in displays) {
+app.on('ready', () => {
+  let displays = electronScreen.getAllDisplays();
+  let externalDisplay = null;
+  for (let i in displays) {
     if (displays[i].bounds.x != 0 || displays[i].bounds.y != 0) {
       externalDisplay = displays[i];
       break;
diff --git a/docs-translations/ko-KR/api/session.md b/docs-translations/ko-KR/api/session.md
index a4f3d3dd7067..efcd79b72f06 100644
--- a/docs-translations/ko-KR/api/session.md
+++ b/docs-translations/ko-KR/api/session.md
@@ -8,12 +8,12 @@
 [`webContents`](web-contents.md)에서 `session` 속성으로 접근할 수도 있습니다.
 
 ```javascript
-var BrowserWindow = require('browser-window');
+const { BrowserWindow } = require('electron');
 
-var win = new BrowserWindow({ width: 800, height: 600 });
+let win = new BrowserWindow({ width: 800, height: 600 });
 win.loadURL("http://github.com");
 
-var ses = win.webContents.session;
+const ses = win.webContents.session;
 ```
 
 ## Methods
@@ -46,7 +46,7 @@ var ses = win.webContents.session;
 ```javascript
 const session = require('electron').session;
 
-var ses = session.fromPartition('persist:name');
+const ses = session.fromPartition('persist:name');
  ```
 
 ### Instance Events
@@ -65,9 +65,9 @@ Electron의 `webContents`에서 `item`을 다운로드할 때 발생하는 이
 틱부터 `item`을 사용할 수 없게 됩니다.
 
 ```javascript
-session.defaultSession.on('will-download', function(event, item, webContents) {
+session.defaultSession.on('will-download', (event, item, webContents) => {
   event.preventDefault();
-  require('request')(item.getURL(), function(data) {
+  require('request')(item.getURL(), (data) => {
     require('fs').writeFileSync('/somewhere', data);
   });
 });
@@ -84,19 +84,19 @@ session.defaultSession.on('will-download', function(event, item, webContents) {
 
 ```javascript
 // 모든 쿠키를 요청합니다.
-session.defaultSession.cookies.get({}, function(error, cookies) {
+session.defaultSession.cookies.get({}, (error, cookies) => {
   console.log(cookies);
 });
 
 // url에 관련된 쿠키를 모두 가져옵니다.
-session.defaultSession.cookies.get({ url : "http://www.github.com" }, function(error, cookies) {
+session.defaultSession.cookies.get({ url : "http://www.github.com" }, (error, cookies) => {
   console.log(cookies);
 });
 
 // 지정한 쿠키 데이터를 설정합니다.
 // 동일한 쿠키가 있으면 해당 쿠키를 덮어씁니다.
-var cookie = { url : "http://www.github.com", name : "dummy_name", value : "dummy" };
-session.defaultSession.cookies.set(cookie, function(error) {
+const cookie = { url : "http://www.github.com", name : "dummy_name", value : "dummy" };
+session.defaultSession.cookies.set(cookie, (error) => {
   if (error)
     console.error(error);
 });
@@ -284,8 +284,8 @@ window.webContents.session.enableNetworkEmulation({offline: true});
 `setCertificateVerifyProc(null)`을 호출하면 기본 검증 프로세스로 되돌립니다.
 
 ```javascript
-myWindow.webContents.session.setCertificateVerifyProc(function(hostname, cert, callback) {
- if (hostname == 'github.com')
+myWindow.webContents.session.setCertificateVerifyProc((hostname, cert, callback) => {
+ if (hostname === 'github.com')
    callback(true);
  else
    callback(false);
@@ -304,9 +304,9 @@ myWindow.webContents.session.setCertificateVerifyProc(function(hostname, cert, c
 호출하면 권한 제공을 거부합니다.
 
 ```javascript
-session.fromPartition(partition).setPermissionRequestHandler(function(webContents, permission, callback) {
+session.fromPartition(partition).setPermissionRequestHandler((webContents, permission, callback) => {
   if (webContents.getURL() === host) {
-    if (permission == "notifications") {
+    if (permission === "notifications") {
       callback(false); // 거부됨.
       return;
     }
@@ -340,11 +340,11 @@ session.fromPartition(partition).setPermissionRequestHandler(function(webContent
 
 ```javascript
 // 다음 url에 대한 User Agent를 조작합니다.
-var filter = {
+const filter = {
   urls: ["https://*.github.com/*", "*://electron.github.io"]
 };
 
-session.defaultSession.webRequest.onBeforeSendHeaders(filter, function(details, callback) {
+session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {
   details.requestHeaders['User-Agent'] = "MyAgent";
   callback({cancel: false, requestHeaders: details.requestHeaders});
 });
diff --git a/docs-translations/ko-KR/api/shell.md b/docs-translations/ko-KR/api/shell.md
index 2882bdce6fb2..f1b8afb14330 100644
--- a/docs-translations/ko-KR/api/shell.md
+++ b/docs-translations/ko-KR/api/shell.md
@@ -7,7 +7,8 @@
 다음 예시는 설정된 URL을 유저의 기본 브라우저로 엽니다:
 
 ```javascript
-const shell = require('electron').shell;
+const { shell } = require('electron');
+
 shell.openExternal('https://github.com');
 ```
 
diff --git a/docs-translations/ko-KR/api/synopsis.md b/docs-translations/ko-KR/api/synopsis.md
index 02d269be2413..2d145bd469ba 100644
--- a/docs-translations/ko-KR/api/synopsis.md
+++ b/docs-translations/ko-KR/api/synopsis.md
@@ -18,13 +18,11 @@ node 모듈을 완벽하게 지원합니다. ([네이티브 모듈](../tutorial/
 메인 프로세스 스크립트는 일반 Node.js 스크립트와 비슷합니다:
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const BrowserWindow = electron.BrowserWindow;
+const { app, BrowserWindow } = require('electron');
 
-var window = null;
+let window = null;
 
-app.on('ready', function() {
+app.on('ready', () => {
   window = new BrowserWindow({width: 800, height: 600});
   window.loadURL('https://github.com');
 });
@@ -38,7 +36,7 @@ app.on('ready', function() {
 <html>
 <body>
 <script>
-  const remote = require('electron').remote;
+  const { remote } = require('electron');
   console.log(remote.app.getVersion());
 </script>
 </body>
@@ -50,15 +48,28 @@ app.on('ready', function() {
 
 ## 분리 할당
 
-만약 CoffeeScript나 Babel을 사용하고 있다면, 빌트인 모듈을 사용할 때
-[분리 할당][destructuring-assignment]을 통해 직관적으로 사용할 수 있습니다:
+0.37 버전부터, [분리 할당][destructuring-assignment]을 통해 빌트인 모듈을 더
+직관적으로 사용할 수 있습니다:
 
 ```javascript
-const {app, BrowserWindow} = require('electron')
+const { app, BrowserWindow } = require('electron');
 ```
 
-아직 플레인 자바스크립트를 쓰고 있다면, Chrome이 ES6를 완전히 지원하기 전까지 기다려야
-합니다.
+모든 `electron` 모듈이 필요하다면, 먼저 require한 후 각 독립적인 모듈을
+`electron`에서 분리 할당함으로써 모듈을 사용할 수 있습니다.
+
+```javascript
+const electron = require('electron');
+const { app, BrowserWindow } = electron;
+ ```
+
+위 코드는 다음과 같습니다:
+
+```javascript
+const electron = require('electron');
+const app = electron.app;
+const BrowserWindow = electron.BrowserWindow;
+```
 
 ## 이전 스타일의 빌트인 모듈 비활성화
 
diff --git a/docs-translations/ko-KR/api/system-preferences.md b/docs-translations/ko-KR/api/system-preferences.md
index c5707ea7eaf1..fa3996872d36 100644
--- a/docs-translations/ko-KR/api/system-preferences.md
+++ b/docs-translations/ko-KR/api/system-preferences.md
@@ -56,7 +56,7 @@ OS X에선 API가 `NSUserDefaults`를 읽어들입니다. 유명한 `key`와 `ty
 예시입니다 (투명한 윈도우는 DWM 컴포지션이 비활성화되어있을 시 작동하지 않습니다):
 
 ```javascript
-let browserOptions = {width: 1000, height: 800};
+let browserOptions = { width: 1000, height: 800 };
 
 // 플랫폼이 지원하는 경우에만 투명 윈도우를 생성.
 if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
diff --git a/docs-translations/ko-KR/api/tray.md b/docs-translations/ko-KR/api/tray.md
index 6162557e1a7c..6cfecd4be8d9 100644
--- a/docs-translations/ko-KR/api/tray.md
+++ b/docs-translations/ko-KR/api/tray.md
@@ -3,15 +3,12 @@
 > 아이콘과 컨텍스트 메뉴를 시스템 알림 영역에 추가합니다.
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const Menu = electron.Menu;
-const Tray = electron.Tray;
+const { app, Menu, Tray } = require('electron');
 
-var appIcon = null;
-app.on('ready', function(){
+let appIcon = null;
+app.on('ready', () => {
   appIcon = new Tray('/path/to/my/icon'); // 현재 어플리케이션 디렉터리를 기준으로 하려면 `__dirname + '/images/tray.png'` 형식으로 입력해야 합니다.
-  var contextMenu = Menu.buildFromTemplate([
+  const contextMenu = Menu.buildFromTemplate([
     { label: 'Item1', type: 'radio' },
     { label: 'Item2', type: 'radio' },
     { label: 'Item3', type: 'radio', checked: true },
@@ -20,7 +17,6 @@ app.on('ready', function(){
   appIcon.setToolTip('이것은 나의 어플리케이션 입니다!');
   appIcon.setContextMenu(contextMenu);
 });
-
 ```
 
 __플랫폼별 한계:__
diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index 079141c10252..ae7b6d2af0d7 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -8,12 +8,12 @@
 접근하는 예시입니다:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
+const { BrowserWindow } = require('electron');
 
-var win = new BrowserWindow({width: 800, height: 1500});
+let win = new BrowserWindow({width: 800, height: 1500});
 win.loadURL("http://github.com");
 
-var webContents = win.webContents;
+let webContents = win.webContents;
 ```
 
 ## Events
@@ -388,10 +388,10 @@ webContents.loadURL(url, options)
 현재 웹 페이지의 URL을 반환합니다.
 
 ```javascript
-var win = new BrowserWindow({width: 800, height: 600});
+let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL("http://github.com");
 
-var currentURL = win.webContents.getURL();
+let currentURL = win.webContents.getURL();
 ```
 
 ### `webContents.getTitle()`
@@ -654,22 +654,22 @@ Chromium의 미리보기 프린팅 커스텀 설정을 이용하여 윈도우의
 ```
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
+const { BrowserWindow } = require('electron');
 const fs = require('fs');
 
-var win = new BrowserWindow({width: 800, height: 600});
-win.loadURL("http://github.com");
+let win = new BrowserWindow({width: 800, height: 600});
+win.loadURL('http://github.com');
 
-win.webContents.on("did-finish-load", function() {
-  // Use default printing options
-  win.webContents.printToPDF({}, function(error, data) {
+win.webContents.on('did-finish-load', () => {
+  // 기본 프린트 옵션을 사용합니다
+  win.webContents.printToPDF({}, (error, data) => {
     if (error) throw error;
-    fs.writeFile("/tmp/print.pdf", data, function(error) {
+    fs.writeFile('/tmp/print.pdf', data, (error) => {
       if (error)
         throw error;
-      console.log("Write PDF successfully.");
-    })
-  })
+      console.log('Write PDF successfully.');
+    });
+  });
 });
 ```
 
@@ -745,13 +745,14 @@ mainWindow.webContents.on('devtools-opened', function() {
 메인 프로세스에서 렌더러 프로세스로 메시지를 보내는 예시 입니다:
 
 ```javascript
-// In the main process.
-var window = null;
-app.on('ready', function() {
-  window = new BrowserWindow({width: 800, height: 600});
-  window.loadURL('file://' + __dirname + '/index.html');
-  window.webContents.on('did-finish-load', function() {
-    window.webContents.send('ping', 'whoooooooh!');
+// 메인 프로세스에서.
+let mainWindow = null;
+
+app.on('ready', () => {
+  mainWindow = new BrowserWindow({width: 800, height: 600});
+  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  mainWindow.webContents.on('did-finish-load', () => {
+    mainWindow.webContents.send('ping', 'whoooooooh!');
   });
 });
 ```
@@ -761,8 +762,8 @@ app.on('ready', function() {
 <html>
 <body>
   <script>
-    require('electron').ipcRenderer.on('ping', function(event, message) {
-      console.log(message);  // Prints "whoooooooh!"
+    require('electron').ipcRenderer.on('ping', (event, message) => {
+      console.log(message);  // "whoooooooh!" 출력
     });
   </script>
 </body>
@@ -878,8 +879,8 @@ Input `event`를 웹 페이지로 전송합니다.
 ```javascript
 win.loadURL('https://github.com');
 
-win.webContents.on('did-finish-load', function() {
-  win.webContents.savePage('/tmp/test.html', 'HTMLComplete', function(error) {
+win.webContents.on('did-finish-load', () => {
+  win.webContents.savePage('/tmp/test.html', 'HTMLComplete', (error) => {
     if (!error)
       console.log("Save page successfully");
   });
@@ -916,13 +917,13 @@ try {
   console.log("Debugger attach failed : ", err);
 };
 
-win.webContents.debugger.on('detach', function(event, reason) {
+win.webContents.debugger.on('detach', (event, reason) => {
   console.log("Debugger detached due to : ", reason);
 });
 
-win.webContents.debugger.on('message', function(event, method, params) {
-  if (method == "Network.requestWillBeSent") {
-    if (params.request.url == "https://www.github.com")
+win.webContents.debugger.on('message', (event, method, params) => {
+  if (method === "Network.requestWillBeSent") {
+    if (params.request.url === "https://www.github.com")
       win.webContents.debugger.detach();
   }
 })
diff --git a/docs-translations/ko-KR/api/web-frame.md b/docs-translations/ko-KR/api/web-frame.md
index 4b9ade4bebed..73566b50bd32 100644
--- a/docs-translations/ko-KR/api/web-frame.md
+++ b/docs-translations/ko-KR/api/web-frame.md
@@ -5,7 +5,7 @@
 다음 예시는 현재 페이지를 200% 줌 합니다:
 
 ```javascript
-var webFrame = require('electron').webFrame;
+const { webFrame } = require('electron');
 
 webFrame.setZoomFactor(2);
 ```
diff --git a/docs-translations/ko-KR/api/web-view-tag.md b/docs-translations/ko-KR/api/web-view-tag.md
index 63b6a92ae896..ab56e2c96a4a 100644
--- a/docs-translations/ko-KR/api/web-view-tag.md
+++ b/docs-translations/ko-KR/api/web-view-tag.md
@@ -29,18 +29,20 @@
 
 ```html
 <script>
-  onload = function() {
-    var webview = document.getElementById("foo");
-    var indicator = document.querySelector(".indicator");
+  onload = () => {
+    const webview = document.getElementById('foo');
+    const indicator = document.querySelector('.indicator');
 
-    var loadstart = function() {
-      indicator.innerText = "loading...";
+    const loadstart = () => {
+      indicator.innerText = 'loading...';
     }
-    var loadstop = function() {
-      indicator.innerText = "";
+
+    const loadstop = () => {
+      indicator.innerText = '';
     }
-    webview.addEventListener("did-start-loading", loadstart);
-    webview.addEventListener("did-stop-loading", loadstop);
+
+    webview.addEventListener('did-start-loading', loadstart);
+    webview.addEventListener('did-stop-loading', loadstop);
   }
 </script>
 ```
@@ -205,7 +207,7 @@ API를 사용할 수 있습니다. 이를 지정하면 내부에서 로우레벨
 **예시**
 
 ```javascript
-webview.addEventListener("dom-ready", function() {
+webview.addEventListener("dom-ready", () => {
   webview.openDevTools();
 });
 ```
@@ -631,10 +633,12 @@ Returns:
 다음 예시 코드는 새 URL을 시스템의 기본 브라우저로 여는 코드입니다.
 
 ```javascript
-webview.addEventListener('new-window', function(e) {
-  var protocol = require('url').parse(e.url).protocol;
+const { shell } = require('electron');
+
+webview.addEventListener('new-window', (e) => {
+  const protocol = require('url').parse(e.url).protocol;
   if (protocol === 'http:' || protocol === 'https:') {
-    require('electron').shell.openExternal(e.url);
+    shell.openExternal(e.url);
   }
 });
 ```
@@ -687,7 +691,7 @@ Returns:
 이동시키는 예시입니다.
 
 ```javascript
-webview.addEventListener('close', function() {
+webview.addEventListener('close', () => {
   webview.src = 'about:blank';
 });
 ```
@@ -706,7 +710,7 @@ Returns:
 
 ```javascript
 // In embedder page.
-webview.addEventListener('ipc-message', function(event) {
+webview.addEventListener('ipc-message', (event) => {
   console.log(event.channel);
   // Prints "pong"
 });
@@ -715,8 +719,8 @@ webview.send('ping');
 
 ```javascript
 // In guest page.
-var ipcRenderer = require('electron').ipcRenderer;
-ipcRenderer.on('ping', function() {
+var { ipcRenderer } = require('electron');
+ipcRenderer.on('ping', () => {
   ipcRenderer.sendToHost('pong');
 });
 ```
diff --git a/docs-translations/ko-KR/faq/electron-faq.md b/docs-translations/ko-KR/faq/electron-faq.md
index ae77335b0008..f74867caded2 100644
--- a/docs-translations/ko-KR/faq/electron-faq.md
+++ b/docs-translations/ko-KR/faq/electron-faq.md
@@ -62,16 +62,16 @@ console.log(require('remote').getGlobal('sharedObject').someProperty);
 만약 빠르게 고치고 싶다면, 다음과 같이 변수를 전역 변수로 만드는 방법이 있습니다:
 
 ```javascript
-app.on('ready', function() {
-  var tray = new Tray('/path/to/icon.png');
+app.on('ready', () => {
+  const tray = new Tray('/path/to/icon.png');
 })
 ```
 
 를 이렇게:
 
 ```javascript
-var tray = null;
-app.on('ready', function() {
+let tray = null;
+app.on('ready', () => {
   tray = new Tray('/path/to/icon.png');
 })
 ```
@@ -86,7 +86,7 @@ Node.js가 Electron에 합쳐졌기 때문에, DOM에 `module`, `exports`, `requ
 
 ```javascript
 // 메인 프로세스에서.
-var mainWindow = new BrowserWindow({
+let mainWindow = new BrowserWindow({
   webPreferences: {
     nodeIntegration: false
   }
diff --git a/docs-translations/ko-KR/tutorial/application-packaging.md b/docs-translations/ko-KR/tutorial/application-packaging.md
index bc56d824617a..2cef8ea9c70d 100644
--- a/docs-translations/ko-KR/tutorial/application-packaging.md
+++ b/docs-translations/ko-KR/tutorial/application-packaging.md
@@ -70,8 +70,8 @@ require('/path/to/example.asar/dir/module.js');
 `BrowserWindow` 클래스를 이용해 원하는 웹 페이지도 표시할 수 있습니다:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
-var win = new BrowserWindow({width: 800, height: 600});
+const { BrowserWindow } = require('electron');
+let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('file:///path/to/example.asar/static/index.html');
 ```
 
@@ -85,7 +85,7 @@ win.loadURL('file:///path/to/example.asar/static/index.html');
 ```html
 <script>
 var $ = require('./jquery.min.js');
-$.get('file:///path/to/example.asar/file.txt', function(data) {
+$.get('file:///path/to/example.asar/file.txt', (data) => {
   console.log(data);
 });
 </script>
@@ -99,7 +99,7 @@ $.get('file:///path/to/example.asar/file.txt', function(data) {
 읽어들입니다:
 
 ```javascript
-var originalFs = require('original-fs');
+const originalFs = require('original-fs');
 originalFs.readFileSync('/path/to/example.asar');
 ```
 
diff --git a/docs-translations/ko-KR/tutorial/desktop-environment-integration.md b/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
index 44cc66352425..46bd5dae01bd 100644
--- a/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
+++ b/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
@@ -17,7 +17,7 @@ Windows, Linux, OS X 운영체제 모두 기본적으로 어플리케이션에
 **참고:** 이 API는 HTML5 API이기 때문에 렌더러 프로세스에서만 사용할 수 있습니다.
 
 ```javascript
-var myNotification = new Notification('Title', {
+let myNotification = new Notification('Title', {
   body: 'Lorem Ipsum Dolor Sit Amet'
 });
 
@@ -114,8 +114,8 @@ const electron = require('electron');
 const app = electron.app;
 const Menu = electron.Menu;
 
-var dockMenu = Menu.buildFromTemplate([
-  { label: 'New Window', click: function() { console.log('New Window'); } },
+const dockMenu = Menu.buildFromTemplate([
+  { label: 'New Window', click: () => { console.log('New Window'); } },
   { label: 'New Window with Settings', submenu: [
     { label: 'Basic' },
     { label: 'Pro'}
@@ -203,24 +203,25 @@ __Windows Media Player의 미리보기 툴바:__
 미리보기 툴바를 설정할 수 있습니다:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
+const { BrowserWindow } = require('electron');
 const path = require('path');
 
-var win = new BrowserWindow({
+let win = new BrowserWindow({
   width: 800,
   height: 600
 });
+
 win.setThumbarButtons([
   {
     tooltip: "button1",
     icon: path.join(__dirname, 'button1.png'),
-    click: function() { console.log("button2 clicked"); }
+    click: () => { console.log("button2 clicked"); }
   },
   {
     tooltip: "button2",
     icon: path.join(__dirname, 'button2.png'),
     flags:['enabled', 'dismissonclick'],
-    click: function() { console.log("button2 clicked."); }
+    click: () => { console.log("button2 clicked."); }
   }
 ]);
 ```
@@ -259,7 +260,7 @@ __작업 표시줄 버튼의 프로그래스 바:__
 있습니다:
 
 ```javascript
-var window = new BrowserWindow({...});
+let window = new BrowserWindow({...});
 window.setProgressBar(0.5);
 ```
 
@@ -286,7 +287,7 @@ __작업 표시줄 버튼 위의 오버레이:__
 API를 사용할 수 있습니다:
 
 ```javascript
-var window = new BrowserWindow({...});
+let window = new BrowserWindow({...});
 window.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
 ```
 
@@ -305,7 +306,7 @@ __대표 파일 팝업 메뉴:__
 [BrowserWindow.setDocumentEdited][setdocumentedited]를 사용할 수 있습니다:
 
 ```javascript
-var window = new BrowserWindow({...});
+let window = new BrowserWindow({...});
 window.setRepresentedFilename('/etc/passwd');
 window.setDocumentEdited(true);
 ```
diff --git a/docs-translations/ko-KR/tutorial/online-offline-events.md b/docs-translations/ko-KR/tutorial/online-offline-events.md
index 698544e83b6c..75dcf05805b5 100644
--- a/docs-translations/ko-KR/tutorial/online-offline-events.md
+++ b/docs-translations/ko-KR/tutorial/online-offline-events.md
@@ -10,8 +10,9 @@ const electron = require('electron');
 const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 
-var onlineStatusWindow;
-app.on('ready', function() {
+let onlineStatusWindow;
+
+app.on('ready', () => {
   onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
   onlineStatusWindow.loadURL('file://' + __dirname + '/online-status.html');
 });
@@ -24,7 +25,7 @@ _online-status.html_
 <html>
 <body>
 <script>
-  var alertOnlineStatus = function() {
+  const alertOnlineStatus = () => {
     window.alert(navigator.onLine ? 'online' : 'offline');
   };
 
@@ -52,13 +53,14 @@ const app = electron.app;
 const ipcMain = electron.ipcMain;
 const BrowserWindow = electron.BrowserWindow;
 
-var onlineStatusWindow;
-app.on('ready', function() {
+let onlineStatusWindow;
+
+app.on('ready', () => {
   onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
-  onlineStatusWindow.loadURL('file://' + __dirname + '/online-status.html');
+  onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`);
 });
 
-ipcMain.on('online-status-changed', function(event, status) {
+ipcMain.on('online-status-changed', (event, status) => {
   console.log(status);
 });
 ```
@@ -70,8 +72,8 @@ _online-status.html_
 <html>
 <body>
 <script>
-  const ipcRenderer = require('electron').ipcRenderer;
-  var updateOnlineStatus = function() {
+  const { ipcRenderer } = require('electron');
+  const updateOnlineStatus = () => {
     ipcRenderer.send('online-status-changed', navigator.onLine ? 'online' : 'offline');
   };
 
diff --git a/docs-translations/ko-KR/tutorial/quick-start.md b/docs-translations/ko-KR/tutorial/quick-start.md
index 45ff83d23764..730c858237e0 100644
--- a/docs-translations/ko-KR/tutorial/quick-start.md
+++ b/docs-translations/ko-KR/tutorial/quick-start.md
@@ -75,61 +75,60 @@ __알림__: 만약 `main` 필드가 `package.json`에 설정되어 있지 않으
 다음과 같이 작성할 수 있습니다:
 
 ```javascript
-const electron = require('electron')
+const electron = require('electron');
 // 어플리케이션 생명주기를 조작 하는 모듈.
-const app = electron.app
+const app = electron.app;
 // 네이티브 브라우저 창을 만드는 모듈.
-const BrowserWindow = electron.BrowserWindow
+const BrowserWindow = electron.BrowserWindow;
 
 // 윈도우 객체를 전역에 유지합니다. 만약 이렇게 하지 않으면
 // 자바스크립트 GC가 일어날 때 창이 멋대로 닫혀버립니다.
-let mainWindow
+let mainWindow;
 
 function createWindow () {
   // 새로운 브라우저 창을 생성합니다.
-  mainWindow = new BrowserWindow({width: 800, height: 600})
+  mainWindow = new BrowserWindow({width: 800, height: 600});
 
   // 그리고 현재 디렉터리의 index.html을 로드합니다.
-  mainWindow.loadURL('file://' + __dirname + '/index.html')
+  mainWindow.loadURL(`file://${__dirname}/index.html`);
 
   // 개발자 도구를 엽니다.
-  mainWindow.webContents.openDevTools()
+  mainWindow.webContents.openDevTools();
 
   // 창이 닫히면 호출됩니다.
-  mainWindow.on('closed', function () {
+  mainWindow.on('closed', () => {
     // 윈도우 객체의 참조를 삭제합니다. 보통 멀티 윈도우 지원을 위해
     // 윈도우 객체를 배열에 저장하는 경우가 있는데 이 경우
     // 해당하는 모든 윈도우 객체의 참조를 삭제해 주어야 합니다.
-    mainWindow = null
-  })
+    mainWindow = null;
+  });
 }
 
 // 이 메서드는 Electron의 초기화가 끝나면 실행되며 브라우저
 // 윈도우를 생성할 수 있습니다. 몇몇 API는 이 이벤트 이후에만
 // 사용할 수 있습니다.
-app.on('ready', createWindow)
+app.on('ready', createWindow);
 
 // 모든 창이 닫히면 어플리케이션 종료.
-app.on('window-all-closed', function () {
+app.on('window-all-closed', () => {
   // OS X의 대부분의 어플리케이션은 유저가 Cmd + Q 커맨드로 확실하게
   // 종료하기 전까지 메뉴바에 남아 계속 실행됩니다.
   if (process.platform !== 'darwin') {
-    app.quit()
+    app.quit();
   }
-})
+});
 
-app.on('activate', function () {
+app.on('activate', () => {
   // OS X에선 보통 독 아이콘이 클릭되고 나서도
   // 열린 윈도우가 없으면, 새로운 윈도우를 다시 만듭니다.
   if (mainWindow === null) {
-    createWindow()
+    createWindow();
   }
-})
+});
 
 // 이 파일엔 제작할 어플리케이션에 특화된 메인 프로세스 코드를
 // 포함할 수 있습니다. 또한 파일을 분리하여 require하는 방법으로
 // 코드를 작성할 수도 있습니다.
-
 ```
 
 마지막으로, 사용자에게 보여줄 `index.html` 웹 페이지의 예시입니다:
diff --git a/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md b/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md
index 37e1c4188df8..8ec73b811f89 100644
--- a/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md
+++ b/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md
@@ -26,7 +26,7 @@ app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so'
 // 선택적인으로 플래시 플레이어의 버전을 설정합니다. 예시로는, v17.0.0.169
 app.commandLine.appendSwitch('ppapi-flash-version', '17.0.0.169');
 
-app.on('ready', function() {
+app.on('ready', () => {
   mainWindow = new BrowserWindow({
     width: 800,
     height: 600,
@@ -34,7 +34,7 @@ app.on('ready', function() {
       plugins: true
     }
   });
-  mainWindow.loadURL('file://' + __dirname + '/index.html');
+  mainWindow.loadURL(`file://${__dirname}/index.html`);
   // 이외의 코드
 });
 ```
diff --git a/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md b/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
index e16f7be944e9..e57bcf229d43 100644
--- a/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
+++ b/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
@@ -42,7 +42,7 @@ $ npm install selenium-webdriver
 ```javascript
 const webdriver = require('selenium-webdriver');
 
-var driver = new webdriver.Builder()
+const driver = new webdriver.Builder()
   // 작동하고 있는 크롬 드라이버의 포트 "9515"를 사용합니다.
   .usingServer('http://localhost:9515')
   .withCapabilities({
@@ -57,8 +57,8 @@ var driver = new webdriver.Builder()
 driver.get('http://www.google.com');
 driver.findElement(webdriver.By.name('q')).sendKeys('webdriver');
 driver.findElement(webdriver.By.name('btnG')).click();
-driver.wait(function() {
- return driver.getTitle().then(function(title) {
+driver.wait(() => {
+ return driver.getTitle().then((title) => {
    return title === 'webdriver - Google Search';
  });
 }, 1000);
@@ -92,29 +92,29 @@ $ npm install webdriverio
 ### 3. 크롬 드라이버에 연결
 ```javascript
 const webdriverio = require('webdriverio');
-var options = {
-    host: "localhost", // localhost에서 작동중인 크롬 드라이버 서버를 사용합니다.
-    port: 9515,        // 연결할 크롬 드라이버 서버의 포트를 설정합니다.
-    desiredCapabilities: {
-        browserName: 'chrome',
-        chromeOptions: {
-          binary: '/Path-to-Your-App/electron', // Electron 바이너리 경로
-          args: [/* cli arguments */]           // 선택 사항, 'app=' + /path/to/your/app/
-        }
+let options = {
+  host: "localhost", // localhost에서 작동중인 크롬 드라이버 서버를 사용합니다.
+  port: 9515,        // 연결할 크롬 드라이버 서버의 포트를 설정합니다.
+  desiredCapabilities: {
+    browserName: 'chrome',
+    chromeOptions: {
+      binary: '/Path-to-Your-App/electron', // Electron 바이너리 경로
+      args: [/* cli arguments */]           // 선택 사항, 'app=' + /path/to/your/app/
     }
+  }
 };
 
-var client = webdriverio.remote(options);
+let client = webdriverio.remote(options);
 
 client
-    .init()
-    .url('http://google.com')
-    .setValue('#q', 'webdriverio')
-    .click('#btnG')
-    .getTitle().then(function(title) {
-        console.log('Title was: ' + title);
-    })
-    .end();
+  .init()
+  .url('http://google.com')
+  .setValue('#q', 'webdriverio')
+  .click('#btnG')
+  .getTitle().then((title) => {
+    console.log('Title was: ' + title);
+  })
+  .end();
 ```
 
 ## 작업 환경
diff --git a/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md b/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md
index 698503df484f..7de590abb07b 100644
--- a/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md
+++ b/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md
@@ -59,8 +59,8 @@ app.commandLine.appendSwitch('widevine-cdm-path', '/path/to/widevinecdmadapter.p
 // 플러그인의 버전은 크롬의 `chrome://plugins` 페이지에서 취득할 수 있습니다.
 app.commandLine.appendSwitch('widevine-cdm-version', '1.4.8.866');
 
-var mainWindow = null;
-app.on('ready', function() {
+let mainWindow = null;
+app.on('ready', () => {
   mainWindow = new BrowserWindow({
     webPreferences: {
       // `plugins`은 활성화되어야 합니다.

From cd3d154cc335028b44de6563ab01da779ffa5db8 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 10 May 2016 17:35:12 +0900
Subject: [PATCH 075/510] :memo: Small fixes

[ci skip]
---
 docs/api/chrome-command-line-switches.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md
index e51ffe5e2eb4..71f669e18e8c 100644
--- a/docs/api/chrome-command-line-switches.md
+++ b/docs/api/chrome-command-line-switches.md
@@ -109,7 +109,7 @@ Enables net log events to be saved and writes them to `path`.
 
 ## --ssl-version-fallback-min=`version`
 
-Sets the minimum SSL/TLS version ("tls1", "tls1.1" or "tls1.2") that TLS
+Sets the minimum SSL/TLS version (`tls1`, `tls1.1` or `tls1.2`) that TLS
 fallback will accept.
 
 ## --cipher-suite-blacklist=`cipher_suites`

From 3cc2dd216ff845c03e52e16c18c4508e7b2ba757 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 10 May 2016 17:41:16 +0900
Subject: [PATCH 076/510] :memo: Adjust line length to `80`

[ci skip]
---
 docs/tutorial/security.md | 73 ++++++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index bdc21aeb3efb..d36f43414cc4 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -1,35 +1,68 @@
 # Security, Native Capabilities, and Your Responsibility
 
-As web developers, we usually enjoy the strong security net of the browser - the risks associated with the code we write is relatively small. We rely on the fairly limited amount of power and capabilities granted to a website – and trust that our users enjoy a browser built by a large team of engineers that is able to quickly respond to newly discovered security threats.
+As web developers, we usually enjoy the strong security net of the browser - the
+risks associated with the code we write is relatively small. We rely on the
+fairly limited amount of power and capabilities granted to a website – and trust
+that our users enjoy a browser built by a large team of engineers that is able
+to quickly respond to newly discovered security threats.
 
-When working with Electron, it is important to understand that Electron is not a web browser. It allows you to build powerful desktop apps with web technologies. Its core feature is the ability to build software is just as powerful as completely native applications, eclipsing the limited feature set of a website. The inherent risks scale with the additional powers granted to your code.
+When working with Electron, it is important to understand that Electron isnot a
+web browser. It allows you to build powerful desktop apps with web technologies.
+Its core feature is the ability to build software is just as powerful as
+completely native applications, eclipsing the limited feature set of a website.
+The inherent risks scale with the additional powers granted to your code.
 
-With that in mind, be aware that displaying arbitrary content from untrusted sources poses a severe security risk that Electron is not built to handle. In fact, the most popular Electron apps (Atom, Slack, Visual Studio Code, etc) display primarily local content (or trusted, secure remote content without Node integration) – if your application executes code from an online source, it is your responsibility to ensure that the code is not malicious.
+With that in mind, be aware that displaying arbitrary content from untrusted
+sources poses a severe security risk that Electron is not built to handle.
+In fact, the most popular Electron apps (Atom, Slack, Visual Studio Code, etc)
+display primarily local content (or trusted, secure remote content without Node
+integration) – if your application executes code from an online source, it is
+your responsibility to ensure that the code is not malicious.
 
 ## Chromium Security Issues and Upgrades
 
-While Electron strives to support new versions of Chromium as soon as possible, developers should be aware that upgrading is a serious undertaking - involving hand-editing dozens or even hundreds of files. Given the resources and contributions available today, Electron will often not be on the very latest version of Chromium, lagging behind by either days or weeks.
+While Electron strives to support new versions of Chromium as soon as possible,
+developers should be aware that upgrading is a serious undertaking - involving
+hand-editing dozens or even hundreds of files. Given the resources and
+contributions available today, Electron will often not be on the very latest
+version of Chromium, lagging behind by either days or weeks.
 
-We feel that our current system of updating the Chromium component strikes an appropriate balance between the resources we have available and the needs of the majority of applications built on top of the framework. We definitely are interested in hearing more about specific use cases from the people that build things on top of Electron. Pull requests and contributions supporting this effort are always very welcome.
+We feel that our current system of updating the Chromium component strikes an
+appropriate balance between the resources we have available and the needs of the
+majority of applications built on top of the framework. We definitely are
+interested in hearing more about specific use cases from the people that build
+things on top of Electron. Pull requests and contributions supporting this
+effort are always very welcome.
 
 ## Ignoring Above Advice
-A security issue exists whenever you receive code from a remote destination and execute it locally. As an example, consider a remote website being displayed inside a browser window. If an attacker somehow manages to change said content (either by attacking the source directly, or by sitting between your app and the actual destination), they will be able to execute native code on the user's machine.
+A security issue exists whenever you receive code from a remote destination and
+execute it locally. As an example, consider a remote website being displayed
+inside a browser window. If an attacker somehow manages to change said content
+(either by attacking the source directly, or by sitting between your app and
+the actual destination), they will be able to execute native code on the user's
+machine.
 
-> :warning: Under no circumstances should you load and execute remote code with enabled Node integration. Instead, use only local files (packaged together with your application) to execute Node code. To display remote content, use the `webview` tag and make sure to disable the `nodeIntegration`.
+> :warning: Under no circumstances should you load and execute remote code with
+enabled Node integration. Instead, use only local files (packaged together with
+your application) to execute Node code. To display remote content, use the
+`webview` tag and make sure to disable the `nodeIntegration`.
 
 #### Checklist
 This is not bulletproof, but at the least, you should attempt the following:
 
- * Only display secure (https) content
- * Disable the Node integration in all renderers that display remote content (using `webPreferences`)
- * Do not disable `webSecurity`. Disabling it will disable the same-origin policy.
- * Do not set `allowDisplayingInsecureContent` to true.
- * Do not set `allowRunningInsecureContent` to true.
- * Do not enable `experimentalFeatures` or `experimentalCanvasFeatures` unless you know what you're doing.
- * Do not use `blinkFeatures` unless you know what you're doing.
- * WebViews: Set `nodeintegration` to false 
- * WebViews: Do not use `disablewebsecurity`
- * WebViews: Do not use `allowpopups`
- * WebViews: Do not use `insertCSS` or `executeJavaScript` with remote CSS/JS.
- 
-Again, this list merely minimizes the risk, it does not remove it. If your goal is to display a website, a browser will be a more secure option. 
+* Only display secure (https) content
+* Disable the Node integration in all renderers that display remote content
+  (using `webPreferences`)
+* Do not disable `webSecurity`. Disabling it will disable the same-origin policy.
+* Do not set `allowDisplayingInsecureContent` to true.
+* Do not set `allowRunningInsecureContent` to true.
+* Do not enable `experimentalFeatures` or `experimentalCanvasFeatures` unless
+  you know what you're doing.
+* Do not use `blinkFeatures` unless you know what you're doing.
+* WebViews: Set `nodeintegration` to false
+* WebViews: Do not use `disablewebsecurity`
+* WebViews: Do not use `allowpopups`
+* WebViews: Do not use `insertCSS` or `executeJavaScript` with remote CSS/JS.
+
+Again, this list merely minimizes the risk, it does not remove it. If your goal
+is to display a website, a browser will be a more secure option.

From 8e48fde5ac975303622d25bba131ac374f0f251e Mon Sep 17 00:00:00 2001
From: zicai <zicaiyouzi@gmail.com>
Date: Tue, 10 May 2016 16:53:14 +0800
Subject: [PATCH 077/510] Docs:fix a minor typo

---
 docs-translations/zh-CN/api/process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-translations/zh-CN/api/process.md b/docs-translations/zh-CN/api/process.md
index 89a5e02a6758..28127776cf0f 100644
--- a/docs-translations/zh-CN/api/process.md
+++ b/docs-translations/zh-CN/api/process.md
@@ -39,7 +39,7 @@ process.once('loaded', function() {
 
 ### `process.hang()`
 
-使当前进程的主线成挂起.
+使当前进程的主线程挂起.
 
 ### `process.setFdLimit(maxDescriptors)` _OS X_ _Linux_
 

From 5787bb022680f966d80fe4a28bbba584f854d3c5 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 10 May 2016 18:42:11 +0900
Subject: [PATCH 078/510] :memo: Fix code style issue

* Match equality operators for consistent that `==`, `!=` by `===`,
`!==`.
* Match string expression notation `"` by `'`.

[ci skip]
---
 docs/api/app.md                               |  2 +-
 docs/api/desktop-capturer.md                  |  2 +-
 docs/api/download-item.md                     |  6 ++---
 docs/api/menu.md                              |  2 +-
 docs/api/remote.md                            |  2 +-
 docs/api/screen.md                            |  2 +-
 docs/api/session.md                           | 10 ++++----
 docs/api/web-contents.md                      | 24 +++++++++----------
 docs/api/web-frame.md                         |  2 +-
 docs/api/web-view-tag.md                      |  6 ++---
 .../desktop-environment-integration.md        |  8 +++----
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index cb19b49b7c18..00580c0ac84b 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -176,7 +176,7 @@ certificate you should prevent the default behavior with
 
 ```javascript
 app.on('certificate-error', function(event, webContents, url, error, certificate, callback) {
-  if (url == "https://github.com") {
+  if (url === 'https://github.com') {
     // Verification logic.
     event.preventDefault();
     callback(true);
diff --git a/docs/api/desktop-capturer.md b/docs/api/desktop-capturer.md
index 9c6d220112b5..dd37d3b60aaa 100644
--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -10,7 +10,7 @@ var { desktopCapturer } = require('electron');
 desktopCapturer.getSources({types: ['window', 'screen']}, (error, sources) => {
   if (error) throw error;
   for (var i = 0; i < sources.length; ++i) {
-    if (sources[i].name == "Electron") {
+    if (sources[i].name === 'Electron') {
       navigator.webkitGetUserMedia({
         audio: false,
         video: {
diff --git a/docs/api/download-item.md b/docs/api/download-item.md
index 6d15176aa09c..14d1931e4468 100644
--- a/docs/api/download-item.md
+++ b/docs/api/download-item.md
@@ -18,10 +18,10 @@ win.webContents.session.on('will-download', (event, item, webContents) => {
     console.log('Received bytes: ' + item.getReceivedBytes());
   });
   item.on('done', (e, state) => {
-    if (state === "completed") {
-      console.log("Download successfully");
+    if (state === 'completed') {
+      console.log('Download successfully');
     } else {
-      console.log("Download is cancelled or interrupted that can't be resumed");
+      console.log('Download is cancelled or interrupted that can\'t be resumed');
     }
   });
 });
diff --git a/docs/api/menu.md b/docs/api/menu.md
index 944a4f810933..53ba9430a4b6 100644
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -98,7 +98,7 @@ const template = [
       {
         label: 'Toggle Developer Tools',
         accelerator: (() => {
-          if (process.platform == 'darwin')
+          if (process.platform === 'darwin')
             return 'Alt+Command+I';
           else
             return 'Ctrl+Shift+I';
diff --git a/docs/api/remote.md b/docs/api/remote.md
index 51dc20bdb2cc..a0c120c1a4d2 100644
--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -79,7 +79,7 @@ exports.withLocalCallback = () => {
 
 ```javascript
 // renderer process
-const mapNumbers = require("remote").require("./mapNumbers");
+const mapNumbers = require('remote').require('./mapNumbers');
 
 const withRendererCb = mapNumbers.withRendererCallback(x => x + 1);
 
diff --git a/docs/api/screen.md b/docs/api/screen.md
index 1e04bdc73888..fbe104b89fda 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -37,7 +37,7 @@ app.on('ready', () => {
   var displays = electronScreen.getAllDisplays();
   var externalDisplay = null;
   for (let i in displays) {
-    if (displays[i].bounds.x != 0 || displays[i].bounds.y != 0) {
+    if (displays[i].bounds.x !== 0 || displays[i].bounds.y !== 0) {
       externalDisplay = displays[i];
       break;
     }
diff --git a/docs/api/session.md b/docs/api/session.md
index 651264b635ee..38103f5820ac 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -12,7 +12,7 @@ property of [`webContents`](web-contents.md) which is a property of
 const { BrowserWindow } = require('electron');
 
 let win = new BrowserWindow({ width: 800, height: 600 });
-win.loadURL("http://github.com");
+win.loadURL('http://github.com');
 
 const ses = win.webContents.session;
 ```
@@ -89,13 +89,13 @@ session.defaultSession.cookies.get({}, (error, cookies) => {
 });
 
 // Query all cookies associated with a specific url.
-session.defaultSession.cookies.get({ url : "http://www.github.com" }, (error, cookies) => {
+session.defaultSession.cookies.get({ url : 'http://www.github.com' }, (error, cookies) => {
   console.log(cookies);
 });
 
 // Set a cookie with the given cookie data;
 // may overwrite equivalent cookies if they exist.
-const cookie = { url : "http://www.github.com", name : "dummy_name", value : "dummy" };
+const cookie = { url : 'http://www.github.com', name : 'dummy_name', value : 'dummy' };
 session.defaultSession.cookies.set(cookie, (error) => {
   if (error)
     console.error(error);
@@ -307,7 +307,7 @@ Calling `callback(true)` will allow the permission and `callback(false)` will re
 ```javascript
 session.fromPartition(partition).setPermissionRequestHandler((webContents, permission, callback) => {
   if (webContents.getURL() === host) {
-    if (permission === "notifications") {
+    if (permission === 'notifications') {
       callback(false); // denied.
       return;
     }
@@ -343,7 +343,7 @@ called with an `response` object when `listener` has done its work.
 ```javascript
 // Modify the user agent for all requests to the following urls.
 const filter = {
-  urls: ["https://*.github.com/*", "*://electron.github.io"]
+  urls: ['https://*.github.com/*', '*://electron.github.io']
 };
 
 session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 3800388b56e3..cd4b9f231789 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -12,7 +12,7 @@ the [`BrowserWindow`](browser-window.md) object. An example of accessing the
 const { BrowserWindow } = require('electron');
 
 let win = new BrowserWindow({width: 800, height: 1500});
-win.loadURL("http://github.com");
+win.loadURL('http://github.com');
 
 let webContents = win.webContents;
 ```
@@ -384,7 +384,7 @@ e.g. the `http://` or `file://`. If the load should bypass http cache then
 use the `pragma` header to achieve it.
 
 ```javascript
-const options = {"extraHeaders" : "pragma: no-cache\n"}
+const options = {extraHeaders: 'pragma: no-cache\n'};
 webContents.loadURL(url, options)
 ```
 
@@ -401,7 +401,7 @@ Returns URL of the current web page.
 
 ```javascript
 let win = new BrowserWindow({width: 800, height: 600});
-win.loadURL("http://github.com");
+win.loadURL('http://github.com');
 
 let currentURL = win.webContents.getURL();
 ```
@@ -605,10 +605,10 @@ Stops any `findInPage` request for the `webContents` with the provided `action`.
 ```javascript
 webContents.on('found-in-page', function(event, result) {
   if (result.finalUpdate)
-    webContents.stopFindInPage("clearSelection");
+    webContents.stopFindInPage('clearSelection');
 });
 
-const requestId = webContents.findInPage("api");
+const requestId = webContents.findInPage('api');
 ```
 
 ### `webContents.hasServiceWorker(callback)`
@@ -898,7 +898,7 @@ win.loadURL('https://github.com');
 win.webContents.on('did-finish-load', () => {
   win.webContents.savePage('/tmp/test.html', 'HTMLComplete', (error) => {
     if (!error)
-      console.log("Save page successfully");
+      console.log('Save page successfully');
   });
 });
 ```
@@ -928,23 +928,23 @@ Debugger API serves as an alternate transport for [remote debugging protocol][rd
 
 ```javascript
 try {
-  win.webContents.debugger.attach("1.1");
+  win.webContents.debugger.attach('1.1');
 } catch(err) {
-  console.log("Debugger attach failed : ", err);
+  console.log('Debugger attach failed : ', err);
 };
 
 win.webContents.debugger.on('detach', (event, reason) => {
-  console.log("Debugger detached due to : ", reason);
+  console.log('Debugger detached due to : ', reason);
 });
 
 win.webContents.debugger.on('message', (event, method, params) => {
-  if (method === "Network.requestWillBeSent") {
-    if (params.request.url === "https://www.github.com")
+  if (method === 'Network.requestWillBeSent') {
+    if (params.request.url === 'https://www.github.com')
       win.webContents.debugger.detach();
   }
 })
 
-win.webContents.debugger.sendCommand("Network.enable");
+win.webContents.debugger.sendCommand('Network.enable');
 ```
 
 #### `webContents.debugger.attach([protocolVersion])`
diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index dcd595d3d973..e7ed05567f2a 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -58,7 +58,7 @@ whether the word passed is correctly spelled.
 An example of using [node-spellchecker][spellchecker] as provider:
 
 ```javascript
-webFrame.setSpellCheckProvider("en-US", true, {
+webFrame.setSpellCheckProvider('en-US', true, {
   spellCheck: function(text) {
     return !(require('spellchecker').isMisspelled(text));
   }
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index a7410e146ae7..da23658c9571 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -213,7 +213,7 @@ The `webview` tag has the following methods:
 **Example**
 
 ```javascript
-webview.addEventListener("dom-ready", () => {
+webview.addEventListener('dom-ready', () => {
   webview.openDevTools();
 });
 ```
@@ -622,10 +622,10 @@ Fired when a result is available for
 ```javascript
 webview.addEventListener('found-in-page', function(e) {
   if (e.result.finalUpdate)
-    webview.stopFindInPage("keepSelection");
+    webview.stopFindInPage('keepSelection');
 });
 
-const rquestId = webview.findInPage("test");
+const rquestId = webview.findInPage('test');
 ```
 
 ### Event: 'new-window'
diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index 470e7799656b..939da469b220 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -219,15 +219,15 @@ let win = new BrowserWindow({
 
 win.setThumbarButtons([
   {
-    tooltip: "button1",
+    tooltip: 'button1',
     icon: path.join(__dirname, 'button1.png'),
-    click: () => { console.log("button2 clicked"); }
+    click: () => { console.log('button2 clicked'); }
   },
   {
-    tooltip: "button2",
+    tooltip: 'button2',
     icon: path.join(__dirname, 'button2.png'),
     flags:['enabled', 'dismissonclick'],
-    click: () => { console.log("button2 clicked."); }
+    click: () => { console.log('button2 clicked.'); }
   }
 ]);
 ```

From 4d7296e1dbe20e6e6fb728e48c701d398ede8beb Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 01:26:38 +0900
Subject: [PATCH 079/510] :memo: Match destructuring style

[ci skip]
---
 docs/api/app.md                                  |  3 ++-
 docs/api/browser-window.md                       |  4 ++--
 docs/api/chrome-command-line-switches.md         |  2 +-
 docs/api/clipboard.md                            |  2 +-
 docs/api/content-tracing.md                      |  2 +-
 docs/api/crash-reporter.md                       |  2 +-
 docs/api/desktop-capturer.md                     |  2 +-
 docs/api/dialog.md                               |  5 +++--
 docs/api/frameless-window.md                     |  2 +-
 docs/api/global-shortcut.md                      |  3 +--
 docs/api/ipc-main.md                             |  4 ++--
 docs/api/menu.md                                 |  2 +-
 docs/api/power-save-blocker.md                   |  2 +-
 docs/api/remote.md                               |  2 +-
 docs/api/screen.md                               |  9 +++------
 docs/api/session.md                              |  2 +-
 docs/api/shell.md                                |  2 +-
 docs/api/synopsis.md                             | 10 +++++-----
 docs/api/web-contents.md                         |  4 ++--
 docs/api/web-frame.md                            |  2 +-
 docs/api/web-view-tag.md                         |  4 ++--
 docs/tutorial/application-packaging.md           |  2 +-
 docs/tutorial/desktop-environment-integration.md |  2 +-
 docs/tutorial/online-offline-events.md           |  2 +-
 24 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 00580c0ac84b..56586ab5b2d1 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -6,7 +6,8 @@ The following example shows how to quit the application when the last window is
 closed:
 
 ```javascript
-const { app } = require('electron');
+const {app} = require('electron');
+
 app.on('window-all-closed', () => {
   app.quit();
 });
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index d4ed6c03322c..e15c53cdb80f 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -4,10 +4,10 @@
 
 ```javascript
 // In the main process.
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 
 // Or in the renderer process.
-const { BrowserWindow } = require('electron').remote;
+const {BrowserWindow} = require('electron').remote;
 
 let win = new BrowserWindow({ width: 800, height: 600, show: false });
 win.on('closed', () => {
diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md
index 71f669e18e8c..751d9295614f 100644
--- a/docs/api/chrome-command-line-switches.md
+++ b/docs/api/chrome-command-line-switches.md
@@ -7,7 +7,7 @@ your app's main script before the [ready][ready] event of the [app][app] module
 is emitted:
 
 ```javascript
-const { app } = require('electron');
+const {app} = require('electron');
 app.commandLine.appendSwitch('remote-debugging-port', '8315');
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1');
 
diff --git a/docs/api/clipboard.md b/docs/api/clipboard.md
index 38bd86594221..9a8c73043233 100644
--- a/docs/api/clipboard.md
+++ b/docs/api/clipboard.md
@@ -5,7 +5,7 @@
 The following example shows how to write a string to the clipboard:
 
 ```javascript
-const { clipboard } = require('electron');
+const {clipboard} = require('electron');
 clipboard.writeText('Example String');
 ```
 
diff --git a/docs/api/content-tracing.md b/docs/api/content-tracing.md
index e6f6b7a0d2d8..8df1ca699889 100644
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -8,7 +8,7 @@ This module does not include a web interface so you need to open
 result.
 
 ```javascript
-const { contentTracing } = require('electron');
+const {contentTracing} = require('electron');
 
 const options = {
   categoryFilter: '*',
diff --git a/docs/api/crash-reporter.md b/docs/api/crash-reporter.md
index 4e4b49df0f7e..6575bbea7656 100644
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -6,7 +6,7 @@ The following is an example of automatically submitting a crash report to a
 remote server:
 
 ```javascript
-const { crashReporter } = require('electron');
+const {crashReporter} = require('electron');
 
 crashReporter.start({
   productName: 'YourName',
diff --git a/docs/api/desktop-capturer.md b/docs/api/desktop-capturer.md
index dd37d3b60aaa..20e6d8625df0 100644
--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -5,7 +5,7 @@ microphone, camera, or screen.
 
 ```javascript
 // In the renderer process.
-var { desktopCapturer } = require('electron');
+const {desktopCapturer} = require('electron');
 
 desktopCapturer.getSources({types: ['window', 'screen']}, (error, sources) => {
   if (error) throw error;
diff --git a/docs/api/dialog.md b/docs/api/dialog.md
index 84aac7c63bf2..c5cc0227a602 100644
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -6,7 +6,8 @@ An example of showing a dialog to select multiple files and directories:
 
 ```javascript
 var win = ...;  // BrowserWindow in which to show the dialog
-const { dialog } = require('electron');
+const {dialog} = require('electron');
+
 console.log(dialog.showOpenDialog({ properties: [ 'openFile', 'openDirectory', 'multiSelections' ]}));
 ```
 
@@ -14,7 +15,7 @@ The Dialog is opened from Electron's main thread. If you want to use the dialog
 object from a renderer process, remember to access it using the remote:
 
 ```javascript
-const { dialog } = require('electron').remote;
+const {dialog} = require('electron').remote;
 ```
 
 ## Methods
diff --git a/docs/api/frameless-window.md b/docs/api/frameless-window.md
index 733baa5c902b..fd0f5d4faefe 100644
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -14,7 +14,7 @@ To create a frameless window, you need to set `frame` to `false` in
 
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 let win = new BrowserWindow({ width: 800, height: 600, frame: false });
 ```
 
diff --git a/docs/api/global-shortcut.md b/docs/api/global-shortcut.md
index 6acb5201066f..d611423c2a38 100644
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -11,8 +11,7 @@ not have the keyboard focus. You should not use this module until the `ready`
 event of the app module is emitted.
 
 ```javascript
-const electron = require('electron');
-const { app, globalShortcut } = electron;
+const {app, globalShortcut} = require('electron');
 
 app.on('ready', () => {
   // Register a 'CommandOrControl+X' shortcut listener.
diff --git a/docs/api/ipc-main.md b/docs/api/ipc-main.md
index e40e4408c077..0b7acbfefa0c 100644
--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -23,7 +23,7 @@ processes:
 
 ```javascript
 // In main process.
-const { ipcMain } = require('electron');
+const {ipcMain} = require('electron');
 ipcMain.on('asynchronous-message', (event, arg) => {
   console.log(arg);  // prints "ping"
   event.sender.send('asynchronous-reply', 'pong');
@@ -37,7 +37,7 @@ ipcMain.on('synchronous-message', (event, arg) => {
 
 ```javascript
 // In renderer process (web page).
-const { ipcRenderer } = require('electron');
+const {ipcRenderer} = require('electron');
 console.log(ipcRenderer.sendSync('synchronous-message', 'ping')); // prints "pong"
 
 ipcRenderer.on('asynchronous-reply', (event, arg) => {
diff --git a/docs/api/menu.md b/docs/api/menu.md
index 53ba9430a4b6..133b681a337b 100644
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -15,7 +15,7 @@ the user right clicks the page:
 ```html
 <!-- index.html -->
 <script>
-const { Menu, MenuItem } = require('electron').remote;
+const {Menu, MenuItem} = require('electron').remote;
 
 const menu = new Menu();
 menu.append(new MenuItem({ label: 'MenuItem1', click: () => { console.log('item 1 clicked'); } }));
diff --git a/docs/api/power-save-blocker.md b/docs/api/power-save-blocker.md
index 86d06a47c160..a44e126b4f10 100644
--- a/docs/api/power-save-blocker.md
+++ b/docs/api/power-save-blocker.md
@@ -5,7 +5,7 @@
 For example:
 
 ```javascript
-const { powerSaveBlocker } = require('electron');
+const {powerSaveBlocker} = require('electron');
 
 const id = powerSaveBlocker.start('prevent-display-sleep');
 console.log(powerSaveBlocker.isStarted(id));
diff --git a/docs/api/remote.md b/docs/api/remote.md
index a0c120c1a4d2..87f73faa638f 100644
--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -14,7 +14,7 @@ similar to Java's [RMI][rmi]. An example of creating a browser window from a
 renderer process:
 
 ```javascript
-const { BrowserWindow } = require('electron').remote;
+const {BrowserWindow} = require('electron').remote;
 
 var win = new BrowserWindow({ width: 800, height: 600 });
 win.loadURL('https://github.com');
diff --git a/docs/api/screen.md b/docs/api/screen.md
index fbe104b89fda..adb017bd37f7 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -13,13 +13,12 @@ In our examples below, we use `electronScreen` as the variable name instead.
 An example of creating a window that fills the whole screen:
 
 ```javascript
-const electron = require('electron');
-const { app, BrowserWindow } = electron;
+const {app, BrowserWindow, screen: electronScreen} = require('electron');
 
 let mainWindow;
 
 app.on('ready', () => {
-  const { width, height } = electron.screen.getPrimaryDisplay().workAreaSize;
+  const {width, height} = electronScreen.getPrimaryDisplay().workAreaSize;
   mainWindow = new BrowserWindow({ width, height });
 });
 ```
@@ -27,13 +26,11 @@ app.on('ready', () => {
 Another example of creating a window in the external display:
 
 ```javascript
-const electron = require('electron');
-const { app, BrowserWindow } = electron;
+const {app, BrowserWindow, screen: electronScreen} = require('electron');
 
 let mainWindow;
 
 app.on('ready', () => {
-  var electronScreen = electron.screen;
   var displays = electronScreen.getAllDisplays();
   var externalDisplay = null;
   for (let i in displays) {
diff --git a/docs/api/session.md b/docs/api/session.md
index 38103f5820ac..94be0656140e 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -9,7 +9,7 @@ property of [`webContents`](web-contents.md) which is a property of
 [`BrowserWindow`](browser-window.md).
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 
 let win = new BrowserWindow({ width: 800, height: 600 });
 win.loadURL('http://github.com');
diff --git a/docs/api/shell.md b/docs/api/shell.md
index c9d5d6ea516c..780e99a0fc1a 100644
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -7,7 +7,7 @@ The `shell` module provides functions related to desktop integration.
 An example of opening a URL in the user's default browser:
 
 ```javascript
-const { shell } = require('electron');
+const {shell} = require('electron');
 
 shell.openExternal('https://github.com');
 ```
diff --git a/docs/api/synopsis.md b/docs/api/synopsis.md
index 60107a0b43bf..159e67f0f3d6 100644
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -19,7 +19,7 @@ scripts to be able to use those modules.
 The main process script is just like a normal Node.js script:
 
 ```javascript
-const { app, BrowserWindow } = require('electron');
+const {app, BrowserWindow} = require('electron');
 
 let window = null;
 
@@ -37,8 +37,8 @@ extra ability to use node modules:
 <html>
 <body>
 <script>
-  const { remote } = require('electron');
-  console.log(remote.app.getVersion());
+  const {app} = require('electron').remote;
+  console.log(app.getVersion());
 </script>
 </body>
 </html>
@@ -53,7 +53,7 @@ As of 0.37, you can use
 built-in modules.
 
 ```javascript
-const { app, BrowserWindow } = require('electron');
+const {app, BrowserWindow} = require('electron');
 ```
 
 If you need the entire `electron` module, you can require it and then using
@@ -61,7 +61,7 @@ destructuring to access the individual modules from `electron`.
 
 ```javascript
 const electron = require('electron');
-const { app, BrowserWindow } = electron;
+const {app, BrowserWindow} = electron;
 ```
 
 This is equivalent to the following code:
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index cd4b9f231789..f5c3d386de86 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -9,7 +9,7 @@ the [`BrowserWindow`](browser-window.md) object. An example of accessing the
 `webContents` object:
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 
 let win = new BrowserWindow({width: 800, height: 1500});
 win.loadURL('http://github.com');
@@ -673,7 +673,7 @@ By default, an empty `options` will be regarded as:
 ```
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 const fs = require('fs');
 
 let win = new BrowserWindow({width: 800, height: 600});
diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index e7ed05567f2a..f77e2ce7eece 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -5,7 +5,7 @@
 An example of zooming current page to 200%.
 
 ```javascript
-const { webFrame } = require('electron');
+const {webFrame} = require('electron');
 
 webFrame.setZoomFactor(2);
 ```
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index da23658c9571..481d0b2dec88 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -644,7 +644,7 @@ Fired when the guest page attempts to open a new browser window.
 The following example code opens the new url in system's default browser.
 
 ```javascript
-const { shell } = require('electron');
+const {shell} = require('electron');
 
 webview.addEventListener('new-window', (e) => {
   const protocol = require('url').parse(e.url).protocol;
@@ -732,7 +732,7 @@ webview.send('ping');
 
 ```javascript
 // In guest page.
-var { ipcRenderer } = require('electron');
+const {ipcRenderer} = require('electron');
 ipcRenderer.on('ping', () => {
   ipcRenderer.sendToHost('pong');
 });
diff --git a/docs/tutorial/application-packaging.md b/docs/tutorial/application-packaging.md
index 257119a573a6..f1c100e6db99 100644
--- a/docs/tutorial/application-packaging.md
+++ b/docs/tutorial/application-packaging.md
@@ -71,7 +71,7 @@ require('/path/to/example.asar/dir/module.js');
 You can also display a web page in an `asar` archive with `BrowserWindow`:
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('file:///path/to/example.asar/static/index.html');
 ```
diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index 939da469b220..dd7826cdf0d7 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -209,7 +209,7 @@ You can use [BrowserWindow.setThumbarButtons][setthumbarbuttons] to set
 thumbnail toolbar in your application:
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 const path = require('path');
 
 let win = new BrowserWindow({
diff --git a/docs/tutorial/online-offline-events.md b/docs/tutorial/online-offline-events.md
index 7e784e336e36..2b7a6d7edc6a 100644
--- a/docs/tutorial/online-offline-events.md
+++ b/docs/tutorial/online-offline-events.md
@@ -71,7 +71,7 @@ _online-status.html_
 <html>
 <body>
 <script>
-  const { ipcRenderer } = require('electron');
+  const {ipcRenderer} = require('electron');
   const updateOnlineStatus = () => {
     ipcRenderer.send('online-status-changed', navigator.onLine ? 'online' : 'offline');
   };

From 552102b88dcdf7af4d43050caacd7f1303effd98 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 01:32:13 +0900
Subject: [PATCH 080/510] :memo: Remove whitespace after code block

[ci skip]
---
 docs/tutorial/quick-start.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index 58f14a281dcb..88f81ecc5430 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -133,7 +133,6 @@ app.on('activate', () => {
 
 // In this file you can include the rest of your app's specific main process
 // code. You can also put them in separate files and require them here.
-
 ```
 
 Finally the `index.html` is the web page you want to show:

From 6e0112bf9f4a77bf60f3a1932b0f93ca088ca4a0 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 01:34:51 +0900
Subject: [PATCH 081/510] :memo: Cleanup codes

[ci skip]
---
 docs/api/menu.md | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/docs/api/menu.md b/docs/api/menu.md
index 133b681a337b..72bd5edc8f15 100644
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -84,12 +84,7 @@ const template = [
       },
       {
         label: 'Toggle Full Screen',
-        accelerator: (() => {
-          if (process.platform === 'darwin')
-            return 'Ctrl+Command+F';
-          else
-            return 'F11';
-        })(),
+        accelerator: process.platform === 'darwin' ? 'Ctrl+Command+F' : 'F11',
         click: (item, focusedWindow) => {
           if (focusedWindow)
             focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
@@ -97,12 +92,7 @@ const template = [
       },
       {
         label: 'Toggle Developer Tools',
-        accelerator: (() => {
-          if (process.platform === 'darwin')
-            return 'Alt+Command+I';
-          else
-            return 'Ctrl+Shift+I';
-        })(),
+        accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
         click: (item, focusedWindow) => {
           if (focusedWindow)
             focusedWindow.webContents.toggleDevTools();

From 139a4f984adfe0fb9a98d789c5a20093925dcfc4 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 01:57:55 +0900
Subject: [PATCH 082/510] :memo: Add missing semicolons

[ci skip]
---
 docs/api/app.md                               |  4 ++--
 docs/api/content-tracing.md                   |  2 +-
 docs/api/protocol.md                          | 22 +++++++++----------
 docs/api/remote.md                            |  8 +++----
 docs/api/synopsis.md                          |  2 +-
 docs/api/web-contents.md                      |  4 ++--
 docs/api/web-view-tag.md                      |  6 ++---
 docs/faq/electron-faq.md                      |  4 ++--
 docs/styleguide.md                            |  4 ++--
 .../desktop-environment-integration.md        |  4 ++--
 docs/tutorial/quick-start.md                  |  2 +-
 docs/tutorial/using-widevine-cdm-plugin.md    |  2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 56586ab5b2d1..ce3a71975487 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -210,7 +210,7 @@ certificate from the store.
 app.on('select-client-certificate', function(event, webContents, url, list, callback) {
   event.preventDefault();
   callback(list[0]);
-})
+});
 ```
 
 ### Event: 'login'
@@ -241,7 +241,7 @@ should prevent the default behavior with `event.preventDefault()` and call
 app.on('login', (event, webContents, request, authInfo, callback) => {
   event.preventDefault();
   callback('username', 'secret');
-})
+});
 ```
 
 ### Event: 'gpu-process-crashed'
diff --git a/docs/api/content-tracing.md b/docs/api/content-tracing.md
index 8df1ca699889..04e7f5a9b5d1 100644
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -13,7 +13,7 @@ const {contentTracing} = require('electron');
 const options = {
   categoryFilter: '*',
   traceOptions: 'record-until-full,enable-sampling'
-}
+};
 
 contentTracing.startRecording(options, function() {
   console.log('Tracing started');
diff --git a/docs/api/protocol.md b/docs/api/protocol.md
index 18ce612d02f1..83481dd6515c 100644
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -6,18 +6,18 @@ An example of implementing a protocol that has the same effect as the
 `file://` protocol:
 
 ```javascript
-const {app, protocol} = require('electron')
-const path = require('path')
+const {app, protocol} = require('electron');
+const path = require('path');
 
 app.on('ready', function () {
   protocol.registerFileProtocol('atom', function (request, callback) {
-    const url = request.url.substr(7)
-    callback({path: path.normalize(__dirname + '/' + url)})
+    const url = request.url.substr(7);
+    callback({path: path.normalize(__dirname + '/' + url)});
   }, function (error) {
     if (error)
-      console.error('Failed to register protocol')
-  })
-})
+      console.error('Failed to register protocol');
+  });
+});
 ```
 **Note:** All methods unless specified can only be used after the `ready` event
 of the `app` module gets emitted.
@@ -52,10 +52,10 @@ So if you want to register a custom protocol to replace the `http` protocol, you
 have to register it as standard scheme:
 
 ```javascript
-protocol.registerStandardSchemes(['atom'])
+protocol.registerStandardSchemes(['atom']);
 app.on('ready', function () {
-  protocol.registerHttpProtocol('atom', ...)
-})
+  protocol.registerHttpProtocol('atom', ...);
+});
 ```
 
 **Note:** This method can only be used before the `ready` event of the `app`
@@ -123,7 +123,7 @@ protocol.registerBufferProtocol('atom', (request, callback) => {
   callback({mimeType: 'text/html', data: new Buffer('<h5>Response</h5>')});
 }, (error) => {
   if (error)
-    console.error('Failed to register protocol')
+    console.error('Failed to register protocol');
 });
 ```
 
diff --git a/docs/api/remote.md b/docs/api/remote.md
index 87f73faa638f..c95df4369ea8 100644
--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -70,11 +70,11 @@ For instance you can't use a function from the renderer process in an
 // main process mapNumbers.js
 exports.withRendererCallback = (mapper) => {
   return [1,2,3].map(mapper);
-}
+};
 
 exports.withLocalCallback = () => {
   return exports.mapNumbers(x => x + 1);
-}
+};
 ```
 
 ```javascript
@@ -83,9 +83,9 @@ const mapNumbers = require('remote').require('./mapNumbers');
 
 const withRendererCb = mapNumbers.withRendererCallback(x => x + 1);
 
-const withLocalCb = mapNumbers.withLocalCallback()
+const withLocalCb = mapNumbers.withLocalCallback();
 
-console.log(withRendererCb, withLocalCb) // [true, true, true], [2, 3, 4]
+console.log(withRendererCb, withLocalCb); // [true, true, true], [2, 3, 4]
 ```
 
 As you can see, the renderer callback's synchronous return value was not as
diff --git a/docs/api/synopsis.md b/docs/api/synopsis.md
index 159e67f0f3d6..01b6e2db4d8a 100644
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -88,7 +88,7 @@ process.env.ELECTRON_HIDE_INTERNAL_MODULES = 'true'
 Or call the `hideInternalModules` API:
 
 ```javascript
-require('electron').hideInternalModules()
+require('electron').hideInternalModules();
 ```
 
 [gui]: https://en.wikipedia.org/wiki/Graphical_user_interface
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index f5c3d386de86..5cf385dde925 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -385,7 +385,7 @@ use the `pragma` header to achieve it.
 
 ```javascript
 const options = {extraHeaders: 'pragma: no-cache\n'};
-webContents.loadURL(url, options)
+webContents.loadURL(url, options);
 ```
 
 ### `webContents.downloadURL(url)`
@@ -942,7 +942,7 @@ win.webContents.debugger.on('message', (event, method, params) => {
     if (params.request.url === 'https://www.github.com')
       win.webContents.debugger.detach();
   }
-})
+});
 
 win.webContents.debugger.sendCommand('Network.enable');
 ```
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index 481d0b2dec88..055642c13d3f 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -37,15 +37,15 @@ and displays a "loading..." message during the load time:
 
     const loadstart = () => {
       indicator.innerText = 'loading...';
-    }
+    };
 
     const loadstop = () => {
       indicator.innerText = '';
-    }
+    };
 
     webview.addEventListener('did-start-loading', loadstart);
     webview.addEventListener('did-stop-loading', loadstop);
-  }
+  };
 </script>
 ```
 
diff --git a/docs/faq/electron-faq.md b/docs/faq/electron-faq.md
index 68714d69ada7..94a4c6714b55 100644
--- a/docs/faq/electron-faq.md
+++ b/docs/faq/electron-faq.md
@@ -65,7 +65,7 @@ code from this:
 ```javascript
 app.on('ready', () => {
   const tray = new Tray('/path/to/icon.png');
-})
+});
 ```
 
 to this:
@@ -74,7 +74,7 @@ to this:
 let tray = null;
 app.on('ready', () => {
   tray = new Tray('/path/to/icon.png');
-})
+});
 ```
 
 ## I can not use jQuery/RequireJS/Meteor/AngularJS in Electron.
diff --git a/docs/styleguide.md b/docs/styleguide.md
index cd68414ac240..a34889d2ca34 100644
--- a/docs/styleguide.md
+++ b/docs/styleguide.md
@@ -93,6 +93,6 @@ this event it might look something like this:
 
 ```javascript
 Alarm.on('wake-up', (time) => {
-  console.log(time)
-})
+  console.log(time);
+});
 ```
diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index dd7826cdf0d7..0253f586d49f 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -23,8 +23,8 @@ let myNotification = new Notification('Title', {
 });
 
 myNotification.onclick = function () {
-  console.log('Notification clicked')
-}
+  console.log('Notification clicked');
+};
 ```
 
 While code and user experience across operating systems are similar, there
diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index 88f81ecc5430..6826b244bb64 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -80,7 +80,7 @@ The `main.js` should create windows and handle system events, a typical
 example being:
 
 ```javascript
-const electron = require('electron')
+const electron = require('electron');
 // Module to control application life.
 const app = electron.app;
 // Module to create native browser window.
diff --git a/docs/tutorial/using-widevine-cdm-plugin.md b/docs/tutorial/using-widevine-cdm-plugin.md
index 26590250ed5d..d1afae8558d7 100644
--- a/docs/tutorial/using-widevine-cdm-plugin.md
+++ b/docs/tutorial/using-widevine-cdm-plugin.md
@@ -66,7 +66,7 @@ app.on('ready', () => {
       // The `plugins` have to be enabled.
       plugins: true
     }
-  })
+  });
 });
 ```
 

From f1b184ef78b9e59a387faae5904cc3f159b3ec3b Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 02:15:09 +0900
Subject: [PATCH 083/510] :memo: Fix code style issue

* Change `var` to `let`.
* Change `function() {}` to `() => {}`.
* Use shorthand function syntax on object notation.
* Remove spaces between object notation brackets.
* Small fixes.
---
 docs/api/app.md                                  |  4 ++--
 docs/api/browser-window.md                       |  8 ++++----
 docs/api/content-tracing.md                      |  2 +-
 docs/api/desktop-capturer.md                     |  2 +-
 docs/api/dialog.md                               | 12 ++++++------
 docs/api/frameless-window.md                     |  6 +++---
 docs/api/global-shortcut.md                      |  2 +-
 docs/api/menu.md                                 | 16 ++++++++--------
 docs/api/native-image.md                         |  4 ++--
 docs/api/process.md                              |  2 +-
 docs/api/protocol.md                             |  8 ++++----
 docs/api/remote.md                               |  2 +-
 docs/api/screen.md                               |  8 ++++----
 docs/api/session.md                              |  6 +++---
 docs/api/system-preferences.md                   |  2 +-
 docs/api/tray.md                                 | 13 +++++--------
 docs/api/web-contents.md                         |  6 +++---
 docs/api/web-frame.md                            |  2 +-
 docs/api/web-view-tag.md                         |  4 ++--
 docs/tutorial/application-packaging.md           |  2 +-
 docs/tutorial/desktop-environment-integration.md | 10 +++++-----
 docs/tutorial/quick-start.md                     |  6 +++---
 docs/tutorial/using-selenium-and-webdriver.md    |  4 ++--
 23 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index ce3a71975487..7cf301533e26 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -176,7 +176,7 @@ certificate you should prevent the default behavior with
 `event.preventDefault()` and call `callback(true)`.
 
 ```javascript
-app.on('certificate-error', function(event, webContents, url, error, certificate, callback) {
+app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
   if (url === 'https://github.com') {
     // Verification logic.
     event.preventDefault();
@@ -207,7 +207,7 @@ and `callback` needs to be called with an entry filtered from the list. Using
 certificate from the store.
 
 ```javascript
-app.on('select-client-certificate', function(event, webContents, url, list, callback) {
+app.on('select-client-certificate', (event, webContents, url, list, callback) => {
   event.preventDefault();
   callback(list[0]);
 });
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index e15c53cdb80f..143c0179428b 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -9,7 +9,7 @@ const {BrowserWindow} = require('electron');
 // Or in the renderer process.
 const {BrowserWindow} = require('electron').remote;
 
-let win = new BrowserWindow({ width: 800, height: 600, show: false });
+let win = new BrowserWindow({width: 800, height: 600, show: false});
 win.on('closed', () => {
   win = null;
 });
@@ -220,7 +220,7 @@ reloaded. In Electron, returning an empty string or `false` would cancel the
 close. For example:
 
 ```javascript
-window.onbeforeunload = function(e) {
+window.onbeforeunload = (e) => {
   console.log('I do not want to be closed');
 
   // Unlike usual browsers, in which a string should be returned and the user is
@@ -392,7 +392,7 @@ Objects created with `new BrowserWindow` have the following properties:
 
 ```javascript
 // In this example `win` is our instance
-var win = new BrowserWindow({ width: 800, height: 600 });
+let win = new BrowserWindow({width: 800, height: 600});
 ```
 
 ### `win.webContents`
@@ -689,7 +689,7 @@ attached just below the window frame, but you may want to display them beneath
 a HTML-rendered toolbar. For example:
 
 ```javascript
-var toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
+let toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
 win.setSheetOffset(toolbarRect.height);
 ```
 
diff --git a/docs/api/content-tracing.md b/docs/api/content-tracing.md
index 04e7f5a9b5d1..d269d602ef59 100644
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -15,7 +15,7 @@ const options = {
   traceOptions: 'record-until-full,enable-sampling'
 };
 
-contentTracing.startRecording(options, function() {
+contentTracing.startRecording(options, () => {
   console.log('Tracing started');
 
   setTimeout(() => {
diff --git a/docs/api/desktop-capturer.md b/docs/api/desktop-capturer.md
index 20e6d8625df0..a72539a7a283 100644
--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -9,7 +9,7 @@ const {desktopCapturer} = require('electron');
 
 desktopCapturer.getSources({types: ['window', 'screen']}, (error, sources) => {
   if (error) throw error;
-  for (var i = 0; i < sources.length; ++i) {
+  for (let i = 0; i < sources.length; ++i) {
     if (sources[i].name === 'Electron') {
       navigator.webkitGetUserMedia({
         audio: false,
diff --git a/docs/api/dialog.md b/docs/api/dialog.md
index c5cc0227a602..0ba41df96adf 100644
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -5,10 +5,10 @@
 An example of showing a dialog to select multiple files and directories:
 
 ```javascript
-var win = ...;  // BrowserWindow in which to show the dialog
+let win = ...;  // BrowserWindow in which to show the dialog
 const {dialog} = require('electron');
 
-console.log(dialog.showOpenDialog({ properties: [ 'openFile', 'openDirectory', 'multiSelections' ]}));
+console.log(dialog.showOpenDialog({properties: ['openFile', 'openDirectory', 'multiSelections']}));
 ```
 
 The Dialog is opened from Electron's main thread. If you want to use the dialog
@@ -43,10 +43,10 @@ selected when you want to limit the user to a specific type. For example:
 ```javascript
 {
   filters: [
-    { name: 'Images', extensions: ['jpg', 'png', 'gif'] },
-    { name: 'Movies', extensions: ['mkv', 'avi', 'mp4'] },
-    { name: 'Custom File Type', extensions: ['as'] },
-    { name: 'All Files', extensions: ['*'] }
+    {name: 'Images', extensions: ['jpg', 'png', 'gif']},
+    {name: 'Movies', extensions: ['mkv', 'avi', 'mp4']},
+    {name: 'Custom File Type', extensions: ['as']},
+    {name: 'All Files', extensions: ['*']}
   ]
 }
 ```
diff --git a/docs/api/frameless-window.md b/docs/api/frameless-window.md
index fd0f5d4faefe..f3017037210d 100644
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -15,7 +15,7 @@ To create a frameless window, you need to set `frame` to `false` in
 
 ```javascript
 const {BrowserWindow} = require('electron');
-let win = new BrowserWindow({ width: 800, height: 600, frame: false });
+let win = new BrowserWindow({width: 800, height: 600, frame: false});
 ```
 
 ### Alternatives on OS X
@@ -28,7 +28,7 @@ the window controls ("traffic lights") for standard window actions.
 You can do so by specifying the new `titleBarStyle` option:
 
 ```javascript
-let win = new BrowserWindow({ 'titleBarStyle': 'hidden' });
+let win = new BrowserWindow({titleBarStyle: 'hidden'});
 ```
 
 ## Transparent window
@@ -37,7 +37,7 @@ By setting the `transparent` option to `true`, you can also make the frameless
 window transparent:
 
 ```javascript
-let win = new BrowserWindow({ transparent: true, frame: false });
+let win = new BrowserWindow({transparent: true, frame: false});
 ```
 
 ### Limitations
diff --git a/docs/api/global-shortcut.md b/docs/api/global-shortcut.md
index d611423c2a38..d9488a7b7fd9 100644
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -15,7 +15,7 @@ const {app, globalShortcut} = require('electron');
 
 app.on('ready', () => {
   // Register a 'CommandOrControl+X' shortcut listener.
-  const ret = globalShortcut.register('CommandOrControl+X', function() {
+  const ret = globalShortcut.register('CommandOrControl+X', () => {
     console.log('CommandOrControl+X is pressed');
   });
 
diff --git a/docs/api/menu.md b/docs/api/menu.md
index 72bd5edc8f15..1dc2a5af0a1b 100644
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -18,9 +18,9 @@ the user right clicks the page:
 const {Menu, MenuItem} = require('electron').remote;
 
 const menu = new Menu();
-menu.append(new MenuItem({ label: 'MenuItem1', click: () => { console.log('item 1 clicked'); } }));
-menu.append(new MenuItem({ type: 'separator' }));
-menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', checked: true }));
+menu.append(new MenuItem({label: 'MenuItem1', click() { console.log('item 1 clicked'); }}));
+menu.append(new MenuItem({type: 'separator'}));
+menu.append(new MenuItem({label: 'MenuItem2', type: 'checkbox', checked: true}));
 
 window.addEventListener('contextmenu', (e) => {
   e.preventDefault();
@@ -78,14 +78,14 @@ const template = [
       {
         label: 'Reload',
         accelerator: 'CmdOrCtrl+R',
-        click: (item, focusedWindow) => {
+        click(item, focusedWindow) {
           if (focusedWindow) focusedWindow.reload();
         }
       },
       {
         label: 'Toggle Full Screen',
         accelerator: process.platform === 'darwin' ? 'Ctrl+Command+F' : 'F11',
-        click: (item, focusedWindow) => {
+        click(item, focusedWindow) {
           if (focusedWindow)
             focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
         }
@@ -93,7 +93,7 @@ const template = [
       {
         label: 'Toggle Developer Tools',
         accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-        click: (item, focusedWindow) => {
+        click(item, focusedWindow) {
           if (focusedWindow)
             focusedWindow.webContents.toggleDevTools();
         }
@@ -122,7 +122,7 @@ const template = [
     submenu: [
       {
         label: 'Learn More',
-        click: () => { require('electron').shell.openExternal('http://electron.atom.io') }
+        click() { require('electron').shell.openExternal('http://electron.atom.io'); }
       },
     ]
   },
@@ -168,7 +168,7 @@ if (process.platform === 'darwin') {
       {
         label: 'Quit',
         accelerator: 'Command+Q',
-        click: () => { app.quit(); }
+        click() { app.quit(); }
       },
     ]
   });
diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index 7ab08457c860..6d42ca15e9ae 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -49,7 +49,7 @@ images/
 
 
 ```javascript
-var appIcon = new Tray('/Users/somebody/images/icon.png');
+let appIcon = new Tray('/Users/somebody/images/icon.png');
 ```
 
 Following suffixes for DPI are also supported:
@@ -118,7 +118,7 @@ The following methods are available on instances of `nativeImage`:
 ```javascript
 const nativeImage = require('electron').nativeImage;
 
-var image = nativeImage.createFromPath('/Users/somebody/images/icon.png');
+let image = nativeImage.createFromPath('/Users/somebody/images/icon.png');
 ```
 
 ### `image.toPng()`
diff --git a/docs/api/process.md b/docs/api/process.md
index ab637e8a2b9e..ec982d3d74aa 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -32,7 +32,7 @@ the global scope when node integration is turned off:
 // preload.js
 const _setImmediate = setImmediate;
 const _clearImmediate = clearImmediate;
-process.once('loaded', function() {
+process.once('loaded', () => {
   global.setImmediate = _setImmediate;
   global.clearImmediate = _clearImmediate;
 });
diff --git a/docs/api/protocol.md b/docs/api/protocol.md
index 83481dd6515c..bcea37bd224c 100644
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -9,11 +9,11 @@ An example of implementing a protocol that has the same effect as the
 const {app, protocol} = require('electron');
 const path = require('path');
 
-app.on('ready', function () {
-  protocol.registerFileProtocol('atom', function (request, callback) {
+app.on('ready', () => {
+  protocol.registerFileProtocol('atom', (request, callback) => {
     const url = request.url.substr(7);
     callback({path: path.normalize(__dirname + '/' + url)});
-  }, function (error) {
+  }, (error) => {
     if (error)
       console.error('Failed to register protocol');
   });
@@ -53,7 +53,7 @@ have to register it as standard scheme:
 
 ```javascript
 protocol.registerStandardSchemes(['atom']);
-app.on('ready', function () {
+app.on('ready', () => {
   protocol.registerHttpProtocol('atom', ...);
 });
 ```
diff --git a/docs/api/remote.md b/docs/api/remote.md
index c95df4369ea8..bf82badca74a 100644
--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -16,7 +16,7 @@ renderer process:
 ```javascript
 const {BrowserWindow} = require('electron').remote;
 
-var win = new BrowserWindow({ width: 800, height: 600 });
+let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('https://github.com');
 ```
 
diff --git a/docs/api/screen.md b/docs/api/screen.md
index adb017bd37f7..258263904b6d 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -8,7 +8,7 @@ emitted (by invoking or requiring it).
 `screen` is an [EventEmitter](http://nodejs.org/api/events.html#events_class_events_eventemitter).
 
 **Note:** In the renderer / DevTools, `window.screen` is a reserved DOM
-property, so writing `var screen = require('electron').screen` will not work.
+property, so writing `let {screen} = require('electron')` will not work.
 In our examples below, we use `electronScreen` as the variable name instead.
 An example of creating a window that fills the whole screen:
 
@@ -19,7 +19,7 @@ let mainWindow;
 
 app.on('ready', () => {
   const {width, height} = electronScreen.getPrimaryDisplay().workAreaSize;
-  mainWindow = new BrowserWindow({ width, height });
+  mainWindow = new BrowserWindow({width, height});
 });
 ```
 
@@ -31,8 +31,8 @@ const {app, BrowserWindow, screen: electronScreen} = require('electron');
 let mainWindow;
 
 app.on('ready', () => {
-  var displays = electronScreen.getAllDisplays();
-  var externalDisplay = null;
+  let displays = electronScreen.getAllDisplays();
+  let externalDisplay = null;
   for (let i in displays) {
     if (displays[i].bounds.x !== 0 || displays[i].bounds.y !== 0) {
       externalDisplay = displays[i];
diff --git a/docs/api/session.md b/docs/api/session.md
index 94be0656140e..76ba4a611b0f 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -11,7 +11,7 @@ property of [`webContents`](web-contents.md) which is a property of
 ```javascript
 const {BrowserWindow} = require('electron');
 
-let win = new BrowserWindow({ width: 800, height: 600 });
+let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('http://github.com');
 
 const ses = win.webContents.session;
@@ -89,13 +89,13 @@ session.defaultSession.cookies.get({}, (error, cookies) => {
 });
 
 // Query all cookies associated with a specific url.
-session.defaultSession.cookies.get({ url : 'http://www.github.com' }, (error, cookies) => {
+session.defaultSession.cookies.get({url : 'http://www.github.com'}, (error, cookies) => {
   console.log(cookies);
 });
 
 // Set a cookie with the given cookie data;
 // may overwrite equivalent cookies if they exist.
-const cookie = { url : 'http://www.github.com', name : 'dummy_name', value : 'dummy' };
+const cookie = {url : 'http://www.github.com', name : 'dummy_name', value : 'dummy'};
 session.defaultSession.cookies.set(cookie, (error) => {
   if (error)
     console.error(error);
diff --git a/docs/api/system-preferences.md b/docs/api/system-preferences.md
index cafb1d3745f3..df7ef89e65c4 100644
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -56,7 +56,7 @@ An example of using it to determine if you should create a transparent window or
 not (transparent windows won't work correctly when DWM composition is disabled):
 
 ```javascript
-let browserOptions = { width: 1000, height: 800 };
+let browserOptions = {width: 1000, height: 800};
 
 // Make the window transparent only if the platform supports it.
 if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
diff --git a/docs/api/tray.md b/docs/api/tray.md
index eaf3f6c42bbd..3fa6f606e90a 100644
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -3,19 +3,16 @@
 > Add icons and context menus to the system's notification area.
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const Menu = electron.Menu;
-const Tray = electron.Tray;
+const {app, Menu, Tray} = require('electron');
 
 let appIcon = null;
 app.on('ready', () => {
   appIcon = new Tray('/path/to/my/icon');
   const contextMenu = Menu.buildFromTemplate([
-    { label: 'Item1', type: 'radio' },
-    { label: 'Item2', type: 'radio' },
-    { label: 'Item3', type: 'radio', checked: true },
-    { label: 'Item4', type: 'radio' }
+    {label: 'Item1', type: 'radio'},
+    {label: 'Item2', type: 'radio'},
+    {label: 'Item3', type: 'radio', checked: true},
+    {label: 'Item4', type: 'radio'}
   ]);
   appIcon.setToolTip('This is my application.');
   appIcon.setContextMenu(contextMenu);
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 5cf385dde925..55021945e46d 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -603,7 +603,7 @@ the request can be obtained by subscribing to
 Stops any `findInPage` request for the `webContents` with the provided `action`.
 
 ```javascript
-webContents.on('found-in-page', function(event, result) {
+webContents.on('found-in-page', (event, result) => {
   if (result.finalUpdate)
     webContents.stopFindInPage('clearSelection');
 });
@@ -700,7 +700,7 @@ Adds the specified path to DevTools workspace. Must be used after DevTools
 creation:
 
 ```javascript
-mainWindow.webContents.on('devtools-opened', function() {
+mainWindow.webContents.on('devtools-opened', () => {
   mainWindow.webContents.addWorkSpace(__dirname);
 });
 ```
@@ -887,7 +887,7 @@ End subscribing for frame presentation events.
   * `HTMLOnly` - Save only the HTML of the page.
   * `HTMLComplete` - Save complete-html page.
   * `MHTML` - Save complete-html page as MHTML.
-* `callback` Function - `function(error) {}`.
+* `callback` Function - `(error) => {}`.
   * `error` Error
 
 Returns true if the process of saving page has been initiated successfully.
diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index f77e2ce7eece..de5a21db3db9 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -59,7 +59,7 @@ An example of using [node-spellchecker][spellchecker] as provider:
 
 ```javascript
 webFrame.setSpellCheckProvider('en-US', true, {
-  spellCheck: function(text) {
+  spellCheck(text) {
     return !(require('spellchecker').isMisspelled(text));
   }
 });
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index 055642c13d3f..aa564b79e1fc 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -600,7 +600,7 @@ The following example code forwards all log messages to the embedder's console
 without regard for log level or other properties.
 
 ```javascript
-webview.addEventListener('console-message', function(e) {
+webview.addEventListener('console-message', (e) => {
   console.log('Guest page logged a message:', e.message);
 });
 ```
@@ -620,7 +620,7 @@ Fired when a result is available for
 [`webview.findInPage`](web-view-tag.md#webviewtagfindinpage) request.
 
 ```javascript
-webview.addEventListener('found-in-page', function(e) {
+webview.addEventListener('found-in-page', (e) => {
   if (e.result.finalUpdate)
     webview.stopFindInPage('keepSelection');
 });
diff --git a/docs/tutorial/application-packaging.md b/docs/tutorial/application-packaging.md
index f1c100e6db99..de61e8bd5e97 100644
--- a/docs/tutorial/application-packaging.md
+++ b/docs/tutorial/application-packaging.md
@@ -85,7 +85,7 @@ For example, to get a file with `$.get`:
 
 ```html
 <script>
-var $ = require('./jquery.min.js');
+let $ = require('./jquery.min.js');
 $.get('file:///path/to/example.asar/file.txt', (data) => {
   console.log(data);
 });
diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index 0253f586d49f..72ba75df07c5 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -22,7 +22,7 @@ let myNotification = new Notification('Title', {
   body: 'Lorem Ipsum Dolor Sit Amet'
 });
 
-myNotification.onclick = function () {
+myNotification.onclick = () => {
   console.log('Notification clicked');
 };
 ```
@@ -118,7 +118,7 @@ const app = electron.app;
 const Menu = electron.Menu;
 
 const dockMenu = Menu.buildFromTemplate([
-  { label: 'New Window', click: () => { console.log('New Window'); } },
+  { label: 'New Window', click() { console.log('New Window'); } },
   { label: 'New Window with Settings', submenu: [
     { label: 'Basic' },
     { label: 'Pro'}
@@ -221,13 +221,13 @@ win.setThumbarButtons([
   {
     tooltip: 'button1',
     icon: path.join(__dirname, 'button1.png'),
-    click: () => { console.log('button2 clicked'); }
+    click() { console.log('button2 clicked'); }
   },
   {
     tooltip: 'button2',
     icon: path.join(__dirname, 'button2.png'),
-    flags:['enabled', 'dismissonclick'],
-    click: () => { console.log('button2 clicked.'); }
+    flags: ['enabled', 'dismissonclick'],
+    click() { console.log('button2 clicked.'); }
   }
 ]);
 ```
diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index 6826b244bb64..abbaf105537c 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -82,15 +82,15 @@ example being:
 ```javascript
 const electron = require('electron');
 // Module to control application life.
-const app = electron.app;
+const {app} = electron;
 // Module to create native browser window.
-const BrowserWindow = electron.BrowserWindow;
+const {BrowserWindow} = electron;
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
 
-function createWindow () {
+function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({width: 800, height: 600});
 
diff --git a/docs/tutorial/using-selenium-and-webdriver.md b/docs/tutorial/using-selenium-and-webdriver.md
index af8f00cb2324..7cfa24ef31e8 100644
--- a/docs/tutorial/using-selenium-and-webdriver.md
+++ b/docs/tutorial/using-selenium-and-webdriver.md
@@ -59,7 +59,7 @@ driver.get('http://www.google.com');
 driver.findElement(webdriver.By.name('q')).sendKeys('webdriver');
 driver.findElement(webdriver.By.name('btnG')).click();
 driver.wait(() => {
- return driver.getTitle().then(function(title) {
+ return driver.getTitle().then((title) => {
    return title === 'webdriver - Google Search';
  });
 }, 1000);
@@ -106,7 +106,7 @@ const options = {
   }
 };
 
-var client = webdriverio.remote(options);
+let client = webdriverio.remote(options);
 
 client
   .init()

From 885aeec4428dc975628d6daf59654310bcca50a2 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 02:16:32 +0900
Subject: [PATCH 084/510] :memo: Match variable names

[ci skip]
---
 docs/api/native-image.md                         |  2 +-
 docs/api/synopsis.md                             |  6 +++---
 docs/tutorial/desktop-environment-integration.md | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index 6d42ca15e9ae..b8479ac3b386 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -10,7 +10,7 @@ image file path as a `String`:
 
 ```javascript
 const appIcon = new Tray('/Users/somebody/images/icon.png');
-let window = new BrowserWindow({icon: '/Users/somebody/images/window.png'});
+let win = new BrowserWindow({icon: '/Users/somebody/images/window.png'});
 ```
 
 Or read the image from the clipboard which returns a `nativeImage`:
diff --git a/docs/api/synopsis.md b/docs/api/synopsis.md
index 01b6e2db4d8a..abce9046d0ce 100644
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -21,11 +21,11 @@ The main process script is just like a normal Node.js script:
 ```javascript
 const {app, BrowserWindow} = require('electron');
 
-let window = null;
+let win = null;
 
 app.on('ready', () => {
-  window = new BrowserWindow({width: 800, height: 600});
-  window.loadURL('https://github.com');
+  win = new BrowserWindow({width: 800, height: 600});
+  win.loadURL('https://github.com');
 });
 ```
 
diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index 72ba75df07c5..c552abbf9496 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -267,8 +267,8 @@ To set the progress bar for a Window, you can use the
 [BrowserWindow.setProgressBar][setprogressbar] API:
 
 ```javascript
-let window = new BrowserWindow({...});
-window.setProgressBar(0.5);
+let win = new BrowserWindow({...});
+win.setProgressBar(0.5);
 ```
 
 ## Icon Overlays in Taskbar (Windows)
@@ -294,8 +294,8 @@ To set the overlay icon for a window, you can use the
 [BrowserWindow.setOverlayIcon][setoverlayicon] API:
 
 ```javascript
-let window = new BrowserWindow({...});
-window.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
+let win = new BrowserWindow({...});
+win.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
 ```
 
 ## Represented File of Window (OS X)
@@ -316,9 +316,9 @@ To set the represented file of window, you can use the
 [BrowserWindow.setDocumentEdited][setdocumentedited] APIs:
 
 ```javascript
-let window = new BrowserWindow({...});
-window.setRepresentedFilename('/etc/passwd');
-window.setDocumentEdited(true);
+let win = new BrowserWindow({...});
+win.setRepresentedFilename('/etc/passwd');
+win.setDocumentEdited(true);
 ```
 
 [addrecentdocument]: ../api/app.md#appaddrecentdocumentpath-os-x-windows

From 5146befa469ce17f84391bd77689052934a8c41e Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 02:38:42 +0900
Subject: [PATCH 085/510] :memo: Match variable names

[ci skip]
---
 docs/api/screen.md                         |  8 ++++----
 docs/api/web-contents.md                   | 14 +++++++-------
 docs/faq/electron-faq.md                   |  2 +-
 docs/tutorial/quick-start.md               | 14 +++++++-------
 docs/tutorial/using-pepper-flash-plugin.md |  4 ++--
 docs/tutorial/using-widevine-cdm-plugin.md |  4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/api/screen.md b/docs/api/screen.md
index 258263904b6d..7dd6203316d2 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -15,11 +15,11 @@ An example of creating a window that fills the whole screen:
 ```javascript
 const {app, BrowserWindow, screen: electronScreen} = require('electron');
 
-let mainWindow;
+let win;
 
 app.on('ready', () => {
   const {width, height} = electronScreen.getPrimaryDisplay().workAreaSize;
-  mainWindow = new BrowserWindow({width, height});
+  win = new BrowserWindow({width, height});
 });
 ```
 
@@ -28,7 +28,7 @@ Another example of creating a window in the external display:
 ```javascript
 const {app, BrowserWindow, screen: electronScreen} = require('electron');
 
-let mainWindow;
+let win;
 
 app.on('ready', () => {
   let displays = electronScreen.getAllDisplays();
@@ -41,7 +41,7 @@ app.on('ready', () => {
   }
 
   if (externalDisplay) {
-    mainWindow = new BrowserWindow({
+    win = new BrowserWindow({
       x: externalDisplay.bounds.x + 50,
       y: externalDisplay.bounds.y + 50
     });
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 55021945e46d..47e2e4c34911 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -700,8 +700,8 @@ Adds the specified path to DevTools workspace. Must be used after DevTools
 creation:
 
 ```javascript
-mainWindow.webContents.on('devtools-opened', () => {
-  mainWindow.webContents.addWorkSpace(__dirname);
+win.webContents.on('devtools-opened', () => {
+  win.webContents.addWorkSpace(__dirname);
 });
 ```
 
@@ -763,13 +763,13 @@ An example of sending messages from the main process to the renderer process:
 
 ```javascript
 // In the main process.
-let mainWindow = null;
+let win = null;
 
 app.on('ready', () => {
-  mainWindow = new BrowserWindow({width: 800, height: 600});
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
-  mainWindow.webContents.on('did-finish-load', () => {
-    mainWindow.webContents.send('ping', 'whoooooooh!');
+  win = new BrowserWindow({width: 800, height: 600});
+  win.loadURL(`file://${__dirname}/index.html`);
+  win.webContents.on('did-finish-load', () => {
+    win.webContents.send('ping', 'whoooooooh!');
   });
 });
 ```
diff --git a/docs/faq/electron-faq.md b/docs/faq/electron-faq.md
index 94a4c6714b55..239b4411d42e 100644
--- a/docs/faq/electron-faq.md
+++ b/docs/faq/electron-faq.md
@@ -87,7 +87,7 @@ To solve this, you can turn off node integration in Electron:
 
 ```javascript
 // In the main process.
-let mainWindow = new BrowserWindow({
+let win = new BrowserWindow({
   webPreferences: {
     nodeIntegration: false
   }
diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index abbaf105537c..59ee27602b3b 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -88,24 +88,24 @@ const {BrowserWindow} = electron;
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
-let mainWindow;
+let win;
 
 function createWindow() {
   // Create the browser window.
-  mainWindow = new BrowserWindow({width: 800, height: 600});
+  win = new BrowserWindow({width: 800, height: 600});
 
   // and load the index.html of the app.
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  win.loadURL(`file://${__dirname}/index.html`);
 
   // Open the DevTools.
-  mainWindow.webContents.openDevTools();
+  win.webContents.openDevTools();
 
   // Emitted when the window is closed.
-  mainWindow.on('closed', () => {
+  win.on('closed', () => {
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
-    mainWindow = null;
+    win = null;
   });
 }
 
@@ -126,7 +126,7 @@ app.on('window-all-closed', () => {
 app.on('activate', () => {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
+  if (win === null) {
     createWindow();
   }
 });
diff --git a/docs/tutorial/using-pepper-flash-plugin.md b/docs/tutorial/using-pepper-flash-plugin.md
index 31ab1104b1a3..76c89d6fdd43 100644
--- a/docs/tutorial/using-pepper-flash-plugin.md
+++ b/docs/tutorial/using-pepper-flash-plugin.md
@@ -29,14 +29,14 @@ app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so'
 app.commandLine.appendSwitch('ppapi-flash-version', '17.0.0.169');
 
 app.on('ready', () => {
-  mainWindow = new BrowserWindow({
+  win = new BrowserWindow({
     width: 800,
     height: 600,
     webPreferences: {
       plugins: true
     }
   });
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  win.loadURL(`file://${__dirname}/index.html`);
   // Something else
 });
 ```
diff --git a/docs/tutorial/using-widevine-cdm-plugin.md b/docs/tutorial/using-widevine-cdm-plugin.md
index d1afae8558d7..af1337c5eae8 100644
--- a/docs/tutorial/using-widevine-cdm-plugin.md
+++ b/docs/tutorial/using-widevine-cdm-plugin.md
@@ -59,9 +59,9 @@ app.commandLine.appendSwitch('widevine-cdm-path', '/path/to/widevinecdmadapter.p
 // The version of plugin can be got from `chrome://plugins` page in Chrome.
 app.commandLine.appendSwitch('widevine-cdm-version', '1.4.8.866');
 
-let mainWindow = null;
+let win = null;
 app.on('ready', () => {
-  mainWindow = new BrowserWindow({
+  win = new BrowserWindow({
     webPreferences: {
       // The `plugins` have to be enabled.
       plugins: true

From c4d34eb465cf8bda67ce0c99aff76920b0d7919d Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 03:14:06 +0900
Subject: [PATCH 086/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/api/app.md            |  14 +-
 docs-translations/ko-KR/api/browser-window.md |  12 +-
 .../ko-KR/api/chrome-command-line-switches.md |   5 +-
 docs-translations/ko-KR/api/clipboard.md      |   4 +-
 .../ko-KR/api/content-tracing.md              |   4 +-
 docs-translations/ko-KR/api/crash-reporter.md |   2 +-
 .../ko-KR/api/desktop-capturer.md             |   6 +-
 docs-translations/ko-KR/api/dialog.md         |  24 ++--
 docs-translations/ko-KR/api/download-item.md  |   6 +-
 .../ko-KR/api/frameless-window.md             |  10 +-
 .../ko-KR/api/global-shortcut.md              |   3 +-
 docs-translations/ko-KR/api/ipc-main.md       |   4 +-
 docs-translations/ko-KR/api/menu.md           |  32 ++---
 docs-translations/ko-KR/api/native-image.md   |   7 +-
 docs-translations/ko-KR/api/power-monitor.md  |   2 +-
 .../ko-KR/api/power-save-blocker.md           |   2 +-
 docs-translations/ko-KR/api/process.md        |   2 +-
 docs-translations/ko-KR/api/protocol.md       |  26 ++--
 docs-translations/ko-KR/api/remote.md         |  14 +-
 docs-translations/ko-KR/api/screen.md         |  18 ++-
 docs-translations/ko-KR/api/session.md        |  16 +--
 docs-translations/ko-KR/api/shell.md          |   2 +-
 docs-translations/ko-KR/api/synopsis.md       |  18 +--
 .../ko-KR/api/system-preferences.md           |   2 +-
 docs-translations/ko-KR/api/tray.md           |  10 +-
 docs-translations/ko-KR/api/web-contents.md   | 130 ++++++------------
 docs-translations/ko-KR/api/web-frame.md      |   6 +-
 docs-translations/ko-KR/api/web-view-tag.md   |  20 +--
 docs-translations/ko-KR/faq/electron-faq.md   |   6 +-
 docs-translations/ko-KR/styleguide.md         |   2 +-
 .../ko-KR/tutorial/application-packaging.md   |   4 +-
 .../desktop-environment-integration.md        |  45 +++---
 .../ko-KR/tutorial/online-offline-events.md   |  15 +-
 .../ko-KR/tutorial/quick-start.md             |  18 +--
 .../tutorial/using-pepper-flash-plugin.md     |   4 +-
 .../tutorial/using-selenium-and-webdriver.md  |   2 +-
 .../tutorial/using-widevine-cdm-plugin.md     |   6 +-
 37 files changed, 216 insertions(+), 287 deletions(-)

diff --git a/docs-translations/ko-KR/api/app.md b/docs-translations/ko-KR/api/app.md
index 4b747d0b1b56..52a7baa308ef 100644
--- a/docs-translations/ko-KR/api/app.md
+++ b/docs-translations/ko-KR/api/app.md
@@ -5,7 +5,7 @@
 밑의 예시는 마지막 윈도우가 종료되었을 때, 어플리케이션을 종료시키는 예시입니다:
 
 ```javascript
-const { app } = require('electron');
+const {app} = require('electron');
 app.on('window-all-closed', () => {
   app.quit();
 });
@@ -182,9 +182,9 @@ Returns:
 기본 동작을 방지하고 인증을 승인할 수 있습니다.
 
 ```javascript
-app.on('certificate-error', function(event, webContents, url, error, certificate, callback) {
-  if (url == "https://github.com") {
-    // Verification logic.
+app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
+  if (url === 'https://github.com') {
+    // 확인 로직.
     event.preventDefault();
     callback(true);
   } else {
@@ -213,10 +213,10 @@ Returns:
 것을 막습니다.
 
 ```javascript
-app.on('select-client-certificate', function(event, webContents, url, list, callback) {
+app.on('select-client-certificate', (event, webContents, url, list, callback) => {
   event.preventDefault();
   callback(list[0]);
-})
+});
 ```
 
 ### Event: 'login'
@@ -247,7 +247,7 @@ Returns:
 app.on('login', (event, webContents, request, authInfo, callback) => {
   event.preventDefault();
   callback('username', 'secret');
-})
+});
 ```
 
 ### Event: 'gpu-process-crashed'
diff --git a/docs-translations/ko-KR/api/browser-window.md b/docs-translations/ko-KR/api/browser-window.md
index 321439f84930..ee77a9bbd439 100644
--- a/docs-translations/ko-KR/api/browser-window.md
+++ b/docs-translations/ko-KR/api/browser-window.md
@@ -6,12 +6,12 @@
 
 ```javascript
 // 메인 프로세스에서
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 
 // 또는 렌더러 프로세스에서
-const { BrowserWindow } = require('electron').remote;
+const {BrowserWindow} = require('electron').remote;
 
-let win = new BrowserWindow({ width: 800, height: 600, show: false });
+let win = new BrowserWindow({width: 800, height: 600, show: false});
 win.on('closed', () => {
   win = null;
 });
@@ -214,7 +214,7 @@ Electron에선 빈 문자열 또는 `false`를 전달할 경우 윈도우 종료
 예시는 다음과 같습니다:
 
 ```javascript
-window.onbeforeunload = function(e) {
+window.onbeforeunload = (e) => {
   console.log('I do not want to be closed');
 
   // 반드시 문자열을 반환해야 하고 사용자에게 페이지 언로드에 대한 확인 창을 보여주는
@@ -390,7 +390,7 @@ ID에 해당하는 윈도우를 찾습니다.
 
 ```javascript
 // `win`은 BrowserWindow의 인스턴스입니다
-var win = new BrowserWindow({ width: 800, height: 600 });
+let win = new BrowserWindow({width: 800, height: 600});
 ```
 
 ### `win.webContents`
@@ -683,7 +683,7 @@ Mac OS X에서 시트를 부착할 위치를 지정합니다. 기본적으로 
 표시하기 위해 사용할 것입니다:
 
 ```javascript
-var toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
+let toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
 win.setSheetOffset(toolbarRect.height);
 ```
 
diff --git a/docs-translations/ko-KR/api/chrome-command-line-switches.md b/docs-translations/ko-KR/api/chrome-command-line-switches.md
index 1b5f672fa5a8..810d9c77e949 100644
--- a/docs-translations/ko-KR/api/chrome-command-line-switches.md
+++ b/docs-translations/ko-KR/api/chrome-command-line-switches.md
@@ -7,7 +7,7 @@
 명령줄 옵션을 추가로 지정할 수 있습니다:
 
 ```javascript
-const { app } = require('electron');
+const {app} = require('electron');
 app.commandLine.appendSwitch('remote-debugging-port', '8315');
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1');
 
@@ -109,8 +109,7 @@ Net log 이벤트를 활성화하고 `path`에 로그를 기록합니다.
 
 ## --ssl-version-fallback-min=`version`
 
-TLS fallback에서 사용할 SSL/TLS 최소 버전을 지정합니다. ("tls1", "tls1.1",
-"tls1.2")
+TLS fallback에서 사용할 SSL/TLS 최소 버전을 지정합니다. (`tls1`, `tls1.1`, `tls1.2`)
 
 ## --cipher-suite-blacklist=`cipher_suites`
 
diff --git a/docs-translations/ko-KR/api/clipboard.md b/docs-translations/ko-KR/api/clipboard.md
index 8f48c6f579f0..8b027d2d58e9 100644
--- a/docs-translations/ko-KR/api/clipboard.md
+++ b/docs-translations/ko-KR/api/clipboard.md
@@ -5,7 +5,7 @@
 다음 예시는 클립보드에 문자열을 쓰는 방법을 보여줍니다:
 
 ```javascript
-const { clipboard } = require('electron');
+const {clipboard} = require('electron');
 clipboard.writeText('Example String');
 ```
 
@@ -113,7 +113,7 @@ console.log(clipboard.has('<p>selection</p>'));
 * `type` String (optional)
 
 ```javascript
-clipboard.write({text: 'test', html: "<b>test</b>"});
+clipboard.write({text: 'test', html: '<b>test</b>'});
 ```
 
 `data`를 클립보드에 씁니다.
diff --git a/docs-translations/ko-KR/api/content-tracing.md b/docs-translations/ko-KR/api/content-tracing.md
index 204ed20622d9..57ef5196ddbe 100644
--- a/docs-translations/ko-KR/api/content-tracing.md
+++ b/docs-translations/ko-KR/api/content-tracing.md
@@ -7,14 +7,14 @@
 `chrome://tracing/` 페이지를 열고 생성된 파일을 로드하면 결과를 볼 수 있습니다.
 
 ```javascript
-const { contentTracing } = require('electron');
+const {contentTracing} = require('electron');
 
 const options = {
   categoryFilter: '*',
   traceOptions: 'record-until-full,enable-sampling'
 };
 
-contentTracing.startRecording(options, function() {
+contentTracing.startRecording(options, () => {
   console.log('Tracing started');
 
   setTimeout(() => {
diff --git a/docs-translations/ko-KR/api/crash-reporter.md b/docs-translations/ko-KR/api/crash-reporter.md
index f4e674132ab2..f70d3fb9ed25 100644
--- a/docs-translations/ko-KR/api/crash-reporter.md
+++ b/docs-translations/ko-KR/api/crash-reporter.md
@@ -5,7 +5,7 @@
 다음 예시는 윈격 서버에 어플리케이션 크래시 정보를 자동으로 보고하는 예시입니다:
 
 ```javascript
-const { crashReporter } = require('electron');
+const {crashReporter} = require('electron');
 
 crashReporter.start({
   productName: 'YourName',
diff --git a/docs-translations/ko-KR/api/desktop-capturer.md b/docs-translations/ko-KR/api/desktop-capturer.md
index 6135ca500d5b..7093ad3b6a5a 100644
--- a/docs-translations/ko-KR/api/desktop-capturer.md
+++ b/docs-translations/ko-KR/api/desktop-capturer.md
@@ -5,12 +5,12 @@
 
 ```javascript
 // 렌더러 프로세스 내부
-const { desktopCapturer } = require('electron');
+const {desktopCapturer} = require('electron');
 
 desktopCapturer.getSources({types: ['window', 'screen']}, (error, sources) => {
   if (error) throw error;
-  for (var i = 0; i < sources.length; ++i) {
-    if (sources[i].name == "Electron") {
+  for (let i = 0; i < sources.length; ++i) {
+    if (sources[i].name === 'Electron') {
       navigator.webkitGetUserMedia({
         audio: false,
         video: {
diff --git a/docs-translations/ko-KR/api/dialog.md b/docs-translations/ko-KR/api/dialog.md
index 7282f5888c88..30132383b5b8 100644
--- a/docs-translations/ko-KR/api/dialog.md
+++ b/docs-translations/ko-KR/api/dialog.md
@@ -5,16 +5,16 @@
 다음 예시는 파일과 디렉터리를 다중으로 선택하는 대화 상자를 표시하는 예시입니다:
 
 ```javascript
-var win = ...;  // 대화 상자를 사용할 BrowserWindow 객체
-const { dialog } = require('electron');
-console.log(dialog.showOpenDialog({ properties: [ 'openFile', 'openDirectory', 'multiSelections' ]}));
+let win = ...;  // 대화 상자를 사용할 BrowserWindow 객체
+const {dialog} = require('electron');
+console.log(dialog.showOpenDialog({properties: ['openFile', 'openDirectory', 'multiSelections']}));
 ```
 
 대화 상자는 Electron의 메인 스레드에서 열립니다. 만약 렌더러 프로세스에서 대화 상자
 객체를 사용하고 싶다면, `remote`를 통해 접근하는 방법을 고려해야 합니다:
 
 ```javascript
-const { dialog } = require('electron').remote;
+const {dialog} = require('electron').remote;
 ```
 
 ## Methods
@@ -45,10 +45,10 @@ const { dialog } = require('electron').remote;
 ```javascript
 {
   filters: [
-    { name: 'Images', extensions: ['jpg', 'png', 'gif'] },
-    { name: 'Movies', extensions: ['mkv', 'avi', 'mp4'] },
-    { name: 'Custom File Type', extensions: ['as'] },
-    { name: 'All Files', extensions: ['*'] }
+    {name: 'Images', extensions: ['jpg', 'png', 'gif']},
+    {name: 'Movies', extensions: ['mkv', 'avi', 'mp4']},
+    {name: 'Custom File Type', extensions: ['as']},
+    {name: 'All Files', extensions: ['*']}
   ]
 }
 ```
@@ -102,10 +102,10 @@ const { dialog } = require('electron').remote;
     라벨을 가지고 있을 때 해당 버튼의 인덱스를 반환합니다. 따로 두 라벨이 지정되지
     않은 경우 0을 반환합니다. OS X와 Windows에선 `cancelId` 지정 여부에 상관없이
     "Cancel" 버튼이 언제나 `cancelId`로 지정됩니다.
-  * `noLink` Boolean - Windows Electron은 "Cancel"이나 "Yes"와 같은 흔히 사용되는
-    버튼을 찾으려고 시도하고 대화 상자 내에서 해당 버튼을 커맨드 링크처럼 만듭니다.
-    이 기능으로 앱을 좀 더 Modern Windows 앱처럼 만들 수 있습니다. 이 기능을 원하지
-    않으면 `noLink`를 true로 지정하면 됩니다.
+  * `noLink` Boolean - Windows에서 Electron은 ("Cancel"이나 "Yes"와 같은) 흔히
+    사용되는 버튼을 찾으려고 시도하고 대화 상자 내에서 해당 버튼을 커맨드 링크처럼
+    만듭니다. 이 기능으로 앱을 좀 더 현대적인 Windows 앱처럼 만들 수 있습니다. 이
+    기능을 원하지 않으면 `noLink`를 true로 지정하면 됩니다.
 * `callback` Function (optional)
 
 대화 상자를 표시합니다. `browserWindow`를 지정하면 대화 상자가 완전히 닫힐 때까지
diff --git a/docs-translations/ko-KR/api/download-item.md b/docs-translations/ko-KR/api/download-item.md
index 4de29eb86076..a7489081bb36 100644
--- a/docs-translations/ko-KR/api/download-item.md
+++ b/docs-translations/ko-KR/api/download-item.md
@@ -18,10 +18,10 @@ win.webContents.session.on('will-download', (event, item, webContents) => {
     console.log('Received bytes: ' + item.getReceivedBytes());
   });
   item.on('done', (e, state) => {
-    if (state === "completed") {
-      console.log("Download successfully");
+    if (state === 'completed') {
+      console.log('Download successfully');
     } else {
-      console.log("Download is cancelled or interrupted that can't be resumed");
+      console.log('Download is cancelled or interrupted that can\'t be resumed');
     }
   });
 });
diff --git a/docs-translations/ko-KR/api/frameless-window.md b/docs-translations/ko-KR/api/frameless-window.md
index 95c0294b1357..3d0892a4e2d8 100644
--- a/docs-translations/ko-KR/api/frameless-window.md
+++ b/docs-translations/ko-KR/api/frameless-window.md
@@ -13,8 +13,8 @@ Frameless Window를 만드려면 [BrowserWindow](browser-window.md) 객체의
 `options` 객체에서 `frame` 옵션을 `false`로 지정하면 됩니다:
 
 ```javascript
-const { BrowserWindow } = require('electron');
-let win = new BrowserWindow({ width: 800, height: 600, frame: false });
+const {BrowserWindow} = require('electron');
+let win = new BrowserWindow({width: 800, height: 600, frame: false});
 ```
 
 ### 최신 OS X에서 사용할 수 있는 대안
@@ -22,10 +22,10 @@ let win = new BrowserWindow({ width: 800, height: 600, frame: false });
 OS X 10.10 Yosemite 이후의 최신 버전부터는 테두리가 없는 창을 만들 때 새로운 방법을
 사용할 수 있습니다. `frame` 옵션을 `false`로 지정하여 제목과 창 구성 요소를 모두
 비활성화하는 대신 새로운 `titleBarStyle` 옵션을 통해 제목만 숨기고 창 구성 요소
-("흔히 신호등으로 알고 있는")의 기능과 창 크기를 그대로 유지할 수 있습니다:
+("신호등 버튼")의 기능과 창 크기를 그대로 유지할 수 있습니다:
 
 ```javascript
-let win = new BrowserWindow({ 'titleBarStyle': 'hidden' });
+let win = new BrowserWindow({titleBarStyle: 'hidden'});
 ```
 
 ## 투명한 창 만들기
@@ -34,7 +34,7 @@ Frameless Window 창의 배경을 투명하게 만들고 싶다면 `transparent`
 바꿔주기만 하면됩니다:
 
 ```javascript
-let win = new BrowserWindow({ transparent: true, frame: false });
+let win = new BrowserWindow({transparent: true, frame: false});
 ```
 
 ### API의 한계
diff --git a/docs-translations/ko-KR/api/global-shortcut.md b/docs-translations/ko-KR/api/global-shortcut.md
index 3536cf1f4260..3af9bb403175 100644
--- a/docs-translations/ko-KR/api/global-shortcut.md
+++ b/docs-translations/ko-KR/api/global-shortcut.md
@@ -11,8 +11,7 @@
 사용할 수 없습니다.
 
 ```javascript
-const electron = require('electron');
-const { app, globalShortcut } = electron;
+const {app, globalShortcut} = require('electron');
 
 app.on('ready', () => {
   // 'CommandOrControl+X' 단축키를 리스너에 등록합니다.
diff --git a/docs-translations/ko-KR/api/ipc-main.md b/docs-translations/ko-KR/api/ipc-main.md
index 9b9ef83ed9ec..f50949684c30 100644
--- a/docs-translations/ko-KR/api/ipc-main.md
+++ b/docs-translations/ko-KR/api/ipc-main.md
@@ -20,7 +20,7 @@
 
 ```javascript
 // 메인 프로세스
-const { ipcMain } = require('electron');
+const {ipcMain} = require('electron');
 ipcMain.on('asynchronous-message', (event, arg) => {
   console.log(arg);  // "ping" 출력
   event.sender.send('asynchronous-reply', 'pong');
@@ -34,7 +34,7 @@ ipcMain.on('synchronous-message', (event, arg) => {
 
 ```javascript
 // 렌더러 프로세스 (웹 페이지)
-const { ipcRenderer } = require('electron');
+const {ipcRenderer} = require('electron');
 console.log(ipc.sendSync('synchronous-message', 'ping')); // "pong" 출력
 
 ipcRenderer.on('asynchronous-reply', (arg) => {
diff --git a/docs-translations/ko-KR/api/menu.md b/docs-translations/ko-KR/api/menu.md
index 599c3b930d5e..df3ed0717166 100644
--- a/docs-translations/ko-KR/api/menu.md
+++ b/docs-translations/ko-KR/api/menu.md
@@ -14,12 +14,12 @@
 ```html
 <!-- index.html -->
 <script>
-const { Menu, MenuItem } = require('electron').remote;
+const {Menu, MenuItem} = require('electron').remote;
 
 const menu = new Menu();
-menu.append(new MenuItem({ label: 'MenuItem1', click: () => { console.log('item 1 clicked'); } }));
-menu.append(new MenuItem({ type: 'separator' }));
-menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', checked: true }));
+menu.append(new MenuItem({label: 'MenuItem1', click() { console.log('item 1 clicked'); }}));
+menu.append(new MenuItem({type: 'separator'}));
+menu.append(new MenuItem({label: 'MenuItem2', type: 'checkbox', checked: true}));
 
 window.addEventListener('contextmenu', (e) => {
   e.preventDefault();
@@ -77,32 +77,22 @@ const template = [
       {
         label: 'Reload',
         accelerator: 'CmdOrCtrl+R',
-        click: (item, focusedWindow) => {
+        click(item, focusedWindow) {
           if (focusedWindow) focusedWindow.reload();
         }
       },
       {
         label: 'Toggle Full Screen',
-        accelerator: (() => {
-          if (process.platform === 'darwin')
-            return 'Ctrl+Command+F';
-          else
-            return 'F11';
-        })(),
-        click: (item, focusedWindow) => {
+        accelerator: process.platform === 'darwin' ? 'Ctrl+Command+F' : 'F11',
+        click(item, focusedWindow) {
           if (focusedWindow)
             focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
         }
       },
       {
         label: 'Toggle Developer Tools',
-        accelerator: (() => {
-          if (process.platform == 'darwin')
-            return 'Alt+Command+I';
-          else
-            return 'Ctrl+Shift+I';
-        })(),
-        click: (item, focusedWindow) => {
+        accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+        click(item, focusedWindow) {
           if (focusedWindow)
             focusedWindow.webContents.toggleDevTools();
         }
@@ -131,7 +121,7 @@ const template = [
     submenu: [
       {
         label: 'Learn More',
-        click: () => { require('electron').shell.openExternal('http://electron.atom.io') }
+        click() { require('electron').shell.openExternal('http://electron.atom.io'); }
       },
     ]
   },
@@ -177,7 +167,7 @@ if (process.platform === 'darwin') {
       {
         label: 'Quit',
         accelerator: 'Command+Q',
-        click: () => { app.quit(); }
+        click() { app.quit(); }
       },
     ]
   });
diff --git a/docs-translations/ko-KR/api/native-image.md b/docs-translations/ko-KR/api/native-image.md
index af67a5bdb50a..8fdb1ccc1941 100644
--- a/docs-translations/ko-KR/api/native-image.md
+++ b/docs-translations/ko-KR/api/native-image.md
@@ -10,7 +10,7 @@ Electron은 파일 경로 또는 `nativeImage` 인스턴스를 통해 이미지
 
 ```javascript
 const appIcon = new Tray('/Users/somebody/images/icon.png');
-let window = new BrowserWindow({icon: '/Users/somebody/images/window.png'});
+let win = new BrowserWindow({icon: '/Users/somebody/images/window.png'});
 ```
 
 이 예시는 클립보드로부터 가져온 `nativeImage`로 트레이 메뉴를 생성합니다:
@@ -48,7 +48,7 @@ images/
 
 
 ```javascript
-var appIcon = new Tray('/Users/somebody/images/icon.png');
+let appIcon = new Tray('/Users/somebody/images/icon.png');
 ```
 
 지원하는 DPI 접미사는 다음과 같습니다:
@@ -115,8 +115,7 @@ var appIcon = new Tray('/Users/somebody/images/icon.png');
 
 ```javascript
 const nativeImage = require('electron').nativeImage;
-
-var image = nativeImage.createFromPath('/Users/somebody/images/icon.png');
+let image = nativeImage.createFromPath('/Users/somebody/images/icon.png');
 ```
 
 ### `image.toPng()`
diff --git a/docs-translations/ko-KR/api/power-monitor.md b/docs-translations/ko-KR/api/power-monitor.md
index 7dd0ed94d9bc..860ac5eecbd4 100644
--- a/docs-translations/ko-KR/api/power-monitor.md
+++ b/docs-translations/ko-KR/api/power-monitor.md
@@ -8,7 +8,7 @@
 예시:
 
 ```javascript
-var app = require('app');
+const {app} = require('electron');
 
 app.on('ready', () => {
   require('electron').powerMonitor.on('suspend', () => {
diff --git a/docs-translations/ko-KR/api/power-save-blocker.md b/docs-translations/ko-KR/api/power-save-blocker.md
index 878ae26e4462..145b746cbbbc 100644
--- a/docs-translations/ko-KR/api/power-save-blocker.md
+++ b/docs-translations/ko-KR/api/power-save-blocker.md
@@ -5,7 +5,7 @@
 예시:
 
 ```javascript
-const { powerSaveBlocker } = require('electron');
+const {powerSaveBlocker} = require('electron');
 
 const id = powerSaveBlocker.start('prevent-display-sleep');
 console.log(powerSaveBlocker.isStarted(id));
diff --git a/docs-translations/ko-KR/api/process.md b/docs-translations/ko-KR/api/process.md
index 81d308b08b1a..f605521c404e 100644
--- a/docs-translations/ko-KR/api/process.md
+++ b/docs-translations/ko-KR/api/process.md
@@ -31,7 +31,7 @@ Electron 내부 초기화 스크립트의 로드가 완료되고, 웹 페이지
 // preload.js
 const _setImmediate = setImmediate;
 const _clearImmediate = clearImmediate;
-process.once('loaded', function() {
+process.once('loaded', () => {
   global.setImmediate = _setImmediate;
   global.clearImmediate = _clearImmediate;
 });
diff --git a/docs-translations/ko-KR/api/protocol.md b/docs-translations/ko-KR/api/protocol.md
index 1a9830cc9c2d..97a47c632dc0 100644
--- a/docs-translations/ko-KR/api/protocol.md
+++ b/docs-translations/ko-KR/api/protocol.md
@@ -5,18 +5,18 @@
 다음 예시는 `file://` 프로토콜과 비슷한 일을 하는 커스텀 프로토콜을 설정합니다:
 
 ```javascript
-const {app, protocol} = require('electron')
-const path = require('path')
+const {app, protocol} = require('electron');
+const path = require('path');
 
-app.on('ready', function () {
+app.on('ready', () => {
   protocol.registerFileProtocol('atom', function (request, callback) {
-    const url = request.url.substr(7)
-    callback({path: path.normalize(__dirname + '/' + url)})
+    const url = request.url.substr(7);
+    callback({path: path.normalize(__dirname + '/' + url)});
   }, function (error) {
     if (error)
-      console.error('Failed to register protocol')
-  })
-})
+      console.error('Failed to register protocol');
+  });
+});
 ```
 
 **참고:** 모든 메서드는 따로 표기하지 않는 한 `app` 모듈의 `ready` 이벤트가 발생한
@@ -52,10 +52,10 @@ app.on('ready', function () {
 등록해야만 합니다:
 
 ```javascript
-protocol.registerStandardSchemes(['atom'])
-app.on('ready', function () {
-  protocol.registerHttpProtocol('atom', ...)
-})
+protocol.registerStandardSchemes(['atom']);
+app.on('ready', () => {
+  protocol.registerHttpProtocol('atom', ...);
+});
 ```
 
 **참고:** 이 메서드는 `app` 모듈의 `ready` 이벤트가 발생하기 이전에만 사용할 수
@@ -120,7 +120,7 @@ protocol.registerBufferProtocol('atom', (request, callback) => {
   callback({mimeType: 'text/html', data: new Buffer('<h5>Response</h5>')});
 }, (error) => {
   if (error)
-    console.error('Failed to register protocol')
+    console.error('Failed to register protocol');
 });
 ```
 
diff --git a/docs-translations/ko-KR/api/remote.md b/docs-translations/ko-KR/api/remote.md
index 4bca5d83c147..da8a54413e15 100644
--- a/docs-translations/ko-KR/api/remote.md
+++ b/docs-translations/ko-KR/api/remote.md
@@ -14,9 +14,9 @@ inter-process 통신을 하지 않고도 간단한 API를 통해 직접 메인 
 다음 예시는 렌더러 프로세스에서 브라우저 창을 만드는 예시입니다:
 
 ```javascript
-const { BrowserWindow } = require('electron').remote;
+const {BrowserWindow} = require('electron').remote;
 
-var win = new BrowserWindow({ width: 800, height: 600 });
+let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('https://github.com');
 ```
 
@@ -66,22 +66,22 @@ Remote 객체가 GC 되려면 대응하는 메인 프로세스 내부 객체의
 // mapNumbers.js 메인 프로세스
 exports.withRendererCallback = (mapper) => {
   return [1,2,3].map(mapper);
-}
+;
 
 exports.withLocalCallback = () => {
   return exports.mapNumbers(x => x + 1);
-}
+};
 ```
 
 ```javascript
 // 렌더러 프로세스
-const mapNumbers = require("remote").require("./mapNumbers");
+const mapNumbers = require('remote').require('./mapNumbers');
 
 const withRendererCb = mapNumbers.withRendererCallback(x => x + 1);
 
-const withLocalCb = mapNumbers.withLocalCallback()
+const withLocalCb = mapNumbers.withLocalCallback();
 
-console.log(withRendererCb, withLocalCb) // [true, true, true], [2, 3, 4]
+console.log(withRendererCb, withLocalCb); // [true, true, true], [2, 3, 4]
 ```
 
 보다시피 동기적인 렌더러 콜백 함수의 반환 값은 예상되지 않은 값입니다. 그리고 메인
diff --git a/docs-translations/ko-KR/api/screen.md b/docs-translations/ko-KR/api/screen.md
index 5506f35e612a..7ac3539016d9 100644
--- a/docs-translations/ko-KR/api/screen.md
+++ b/docs-translations/ko-KR/api/screen.md
@@ -15,37 +15,35 @@
 다음 예시는 화면 전체를 채우는 윈도우 창을 생성합니다:
 
 ```javascript
-const electron = require('electron');
-const { app, BrowserWindow } = electron;
+const {app, BrowserWindow, screen: electronScreen} = require('electron');
 
-let mainWindow;
+let win;
 
 app.on('ready', () => {
-  const { width, height } = electron.screen.getPrimaryDisplay().workAreaSize;
-  mainWindow = new BrowserWindow({ width, height });
+  let {width, height} = electronScreen.getPrimaryDisplay().workAreaSize;
+  win = new BrowserWindow({width, height});
 });
 ```
 
 다음 예시는 확장 디스플레이에 윈도우를 생성합니다:
 
 ```javascript
-const electron = require('electron');
-const { screen: electronScreen, app, BrowserWindow } = electron;
+const {app, BrowserWindow, screen: electronScreen} = require('electron');
 
-let mainWindow;
+let win;
 
 app.on('ready', () => {
   let displays = electronScreen.getAllDisplays();
   let externalDisplay = null;
   for (let i in displays) {
-    if (displays[i].bounds.x != 0 || displays[i].bounds.y != 0) {
+    if (displays[i].bounds.x !== 0 || displays[i].bounds.y !== 0) {
       externalDisplay = displays[i];
       break;
     }
   }
 
   if (externalDisplay) {
-    mainWindow = new BrowserWindow({
+    win = new BrowserWindow({
       x: externalDisplay.bounds.x + 50,
       y: externalDisplay.bounds.y + 50
     });
diff --git a/docs-translations/ko-KR/api/session.md b/docs-translations/ko-KR/api/session.md
index efcd79b72f06..1d2896b2055e 100644
--- a/docs-translations/ko-KR/api/session.md
+++ b/docs-translations/ko-KR/api/session.md
@@ -8,12 +8,12 @@
 [`webContents`](web-contents.md)에서 `session` 속성으로 접근할 수도 있습니다.
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 
-let win = new BrowserWindow({ width: 800, height: 600 });
-win.loadURL("http://github.com");
+let win = new BrowserWindow({width: 800, height: 600});
+win.loadURL('http://github.com');
 
-const ses = win.webContents.session;
+let ses = win.webContents.session;
 ```
 
 ## Methods
@@ -89,13 +89,13 @@ session.defaultSession.cookies.get({}, (error, cookies) => {
 });
 
 // url에 관련된 쿠키를 모두 가져옵니다.
-session.defaultSession.cookies.get({ url : "http://www.github.com" }, (error, cookies) => {
+session.defaultSession.cookies.get({url: 'http://www.github.com'}, (error, cookies) => {
   console.log(cookies);
 });
 
 // 지정한 쿠키 데이터를 설정합니다.
 // 동일한 쿠키가 있으면 해당 쿠키를 덮어씁니다.
-const cookie = { url : "http://www.github.com", name : "dummy_name", value : "dummy" };
+const cookie = {url: 'http://www.github.com', name: 'dummy_name', value: 'dummy'};
 session.defaultSession.cookies.set(cookie, (error) => {
   if (error)
     console.error(error);
@@ -306,7 +306,7 @@ myWindow.webContents.session.setCertificateVerifyProc((hostname, cert, callback)
 ```javascript
 session.fromPartition(partition).setPermissionRequestHandler((webContents, permission, callback) => {
   if (webContents.getURL() === host) {
-    if (permission === "notifications") {
+    if (permission === 'notifications') {
       callback(false); // 거부됨.
       return;
     }
@@ -341,7 +341,7 @@ session.fromPartition(partition).setPermissionRequestHandler((webContents, permi
 ```javascript
 // 다음 url에 대한 User Agent를 조작합니다.
 const filter = {
-  urls: ["https://*.github.com/*", "*://electron.github.io"]
+  urls: ['https://*.github.com/*', '*://electron.github.io']
 };
 
 session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {
diff --git a/docs-translations/ko-KR/api/shell.md b/docs-translations/ko-KR/api/shell.md
index f1b8afb14330..d8237db9b382 100644
--- a/docs-translations/ko-KR/api/shell.md
+++ b/docs-translations/ko-KR/api/shell.md
@@ -7,7 +7,7 @@
 다음 예시는 설정된 URL을 유저의 기본 브라우저로 엽니다:
 
 ```javascript
-const { shell } = require('electron');
+const {shell} = require('electron');
 
 shell.openExternal('https://github.com');
 ```
diff --git a/docs-translations/ko-KR/api/synopsis.md b/docs-translations/ko-KR/api/synopsis.md
index 2d145bd469ba..04134689a9fa 100644
--- a/docs-translations/ko-KR/api/synopsis.md
+++ b/docs-translations/ko-KR/api/synopsis.md
@@ -18,13 +18,13 @@ node 모듈을 완벽하게 지원합니다. ([네이티브 모듈](../tutorial/
 메인 프로세스 스크립트는 일반 Node.js 스크립트와 비슷합니다:
 
 ```javascript
-const { app, BrowserWindow } = require('electron');
+const {app, BrowserWindow} = require('electron');
 
-let window = null;
+let win = null;
 
 app.on('ready', () => {
-  window = new BrowserWindow({width: 800, height: 600});
-  window.loadURL('https://github.com');
+  win = new BrowserWindow({width: 800, height: 600});
+  win.loadURL('https://github.com');
 });
 ```
 
@@ -36,8 +36,8 @@ app.on('ready', () => {
 <html>
 <body>
 <script>
-  const { remote } = require('electron');
-  console.log(remote.app.getVersion());
+  const {app} = require('electron').remote;
+  console.log(app.getVersion());
 </script>
 </body>
 </html>
@@ -52,7 +52,7 @@ app.on('ready', () => {
 직관적으로 사용할 수 있습니다:
 
 ```javascript
-const { app, BrowserWindow } = require('electron');
+const {app, BrowserWindow} = require('electron');
 ```
 
 모든 `electron` 모듈이 필요하다면, 먼저 require한 후 각 독립적인 모듈을
@@ -60,7 +60,7 @@ const { app, BrowserWindow } = require('electron');
 
 ```javascript
 const electron = require('electron');
-const { app, BrowserWindow } = electron;
+const {app, BrowserWindow} = electron;
  ```
 
 위 코드는 다음과 같습니다:
@@ -87,7 +87,7 @@ process.env.ELECTRON_HIDE_INTERNAL_MODULES = 'true'
 또는 `hideInternalModules` API를 사용해도 됩니다:
 
 ```javascript
-require('electron').hideInternalModules()
+require('electron').hideInternalModules();
 ```
 
 [gui]: https://en.wikipedia.org/wiki/Graphical_user_interface
diff --git a/docs-translations/ko-KR/api/system-preferences.md b/docs-translations/ko-KR/api/system-preferences.md
index fa3996872d36..c5707ea7eaf1 100644
--- a/docs-translations/ko-KR/api/system-preferences.md
+++ b/docs-translations/ko-KR/api/system-preferences.md
@@ -56,7 +56,7 @@ OS X에선 API가 `NSUserDefaults`를 읽어들입니다. 유명한 `key`와 `ty
 예시입니다 (투명한 윈도우는 DWM 컴포지션이 비활성화되어있을 시 작동하지 않습니다):
 
 ```javascript
-let browserOptions = { width: 1000, height: 800 };
+let browserOptions = {width: 1000, height: 800};
 
 // 플랫폼이 지원하는 경우에만 투명 윈도우를 생성.
 if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
diff --git a/docs-translations/ko-KR/api/tray.md b/docs-translations/ko-KR/api/tray.md
index 6cfecd4be8d9..d208de250201 100644
--- a/docs-translations/ko-KR/api/tray.md
+++ b/docs-translations/ko-KR/api/tray.md
@@ -3,16 +3,16 @@
 > 아이콘과 컨텍스트 메뉴를 시스템 알림 영역에 추가합니다.
 
 ```javascript
-const { app, Menu, Tray } = require('electron');
+const {app, Menu, Tray} = require('electron');
 
 let appIcon = null;
 app.on('ready', () => {
   appIcon = new Tray('/path/to/my/icon'); // 현재 어플리케이션 디렉터리를 기준으로 하려면 `__dirname + '/images/tray.png'` 형식으로 입력해야 합니다.
   const contextMenu = Menu.buildFromTemplate([
-    { label: 'Item1', type: 'radio' },
-    { label: 'Item2', type: 'radio' },
-    { label: 'Item3', type: 'radio', checked: true },
-    { label: 'Item4', type: 'radio' }
+    {label: 'Item1', type: 'radio'},
+    {label: 'Item2', type: 'radio'},
+    {label: 'Item3', type: 'radio', checked: true},
+    {label: 'Item4', type: 'radio'}
   ]);
   appIcon.setToolTip('이것은 나의 어플리케이션 입니다!');
   appIcon.setContextMenu(contextMenu);
diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index ae7b6d2af0d7..d0d7bd43b4b9 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -8,10 +8,10 @@
 접근하는 예시입니다:
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const BrowserWindow = require('electron').BrowserWindow;
 
 let win = new BrowserWindow({width: 800, height: 1500});
-win.loadURL("http://github.com");
+win.loadURL('http://github.com');
 
 let webContents = win.webContents;
 ```
@@ -38,8 +38,7 @@ Returns:
 이 이벤트는 `did-finish-load`와 비슷하나, 로드가 실패했거나 취소되었을 때 발생합니다.
 예를 들면 `window.stop()`이 실행되었을 때 발생합니다. 발생할 수 있는 전체 에러 코드의
 목록과 설명은 [여기](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h)서
-확인할 수 있습니다. 참고로 리다이렉트 응답은 `errorCode` -3과 함께 발생합니다; 이
-에러는 명시적으로 무시할 수 있습니다.
+확인할 수 있습니다.
 
 ### Event: 'did-frame-finish-load'
 
@@ -226,7 +225,7 @@ Returns:
   * `issuerName` String - 인증서 발급자 이름
 * `callback` Function
 
-클라이언트 인증이 요청되었을 때 발생하는 이벤트입니다.
+클라이언트 인증이 요청되었을 때 발생하는 이벤트 입니다.
 
 사용법은 [`app`의 `select-client-certificate` 이벤트](app.md#event-select-client-certificate)와
 같습니다.
@@ -293,7 +292,7 @@ Returns:
 * `image` NativeImage (optional)
 * `scale` Float (optional)
 
-커서 타입이 변경될 때 발생하는 이벤트입니다. `type` 인수는 다음 값이 될 수 있습니다:
+커서 타입이 변경될 때 발생하는 이벤트입니다. `type` 매개변수는 다음 값이 될 수 있습니다:
 `default`, `crosshair`, `pointer`, `text`, `wait`, `help`, `e-resize`, `n-resize`,
 `ne-resize`, `nw-resize`, `s-resize`, `se-resize`, `sw-resize`, `w-resize`,
 `ns-resize`, `ew-resize`, `nesw-resize`, `nwse-resize`, `col-resize`,
@@ -302,59 +301,10 @@ Returns:
 `cell`, `context-menu`, `alias`, `progress`, `nodrop`, `copy`, `none`,
 `not-allowed`, `zoom-in`, `zoom-out`, `grab`, `grabbing`, `custom`.
 
-만약 `type` 인수가 `custom` 이고 `image` 인수가 `NativeImage`를 통한 커스텀
-커서를 지정했을 때, 해당 이미지로 커서가 변경됩니다. 또한 `scale` 인수는 이미지의
+만약 `type` 매개변수가 `custom` 이고 `image` 매개변수가 `NativeImage`를 통한 커스텀
+커서를 지정했을 때, 해당 이미지로 커서가 변경됩니다. 또한 `scale` 매개변수는 이미지의
 크기를 조정합니다.
 
-### Event: 'context-menu'
-
-Returns:
-
-* `event` Event
-* `params` Object
-  * `x` Integer - x 좌표
-  * `y` Integer - y 좌표
-  * `linkURL` String - 컨텍스트 메뉴가 호출된 노드를 둘러싸는 링크의 URL.
-  * `linkText` String - 링크에 연관된 텍스트. 콘텐츠의 링크가 이미지인 경우 빈
-    문자열이 됩니다.
-  * `pageURL` String - 컨텍스트 메뉴가 호출된 상위 수준 페이지의 URL.
-  * `frameURL` String - 컨텍스트 메뉴가 호출된 서브 프레임의 URL.
-  * `srcURL` String - 컨텍스트 메뉴가 호출된 요소에 대한 소스 URL. 요소와 소스 URL은
-    이미지, 오디오, 비디오입니다.
-  * `mediaType` String - 컨텍스트 메뉴가 호출된 노드의 타입. 값은 `none`, `image`,
-    `audio`, `video`, `canvas`, `file` 또는 `plugin`이 될 수 있습니다.
-  * `mediaFlags` Object - 컨텍스트 메뉴가 호출된 미디어 요소에 대한 인수들.
-    * `inError` - Boolean
-    * `isPaused` - Boolean
-    * `isMuted` - Boolean
-    * `hasAudio` - Boolean
-    * `isLooping` - Boolean
-    * `isControlsVisible` - Boolean
-    * `canToggleControls` - Boolean
-    * `canRotate` - Boolean
-  * `hasImageContent` Boolean - 컨텍스트 메뉴가 내용이 있는 이미지에서 호출되었는지
-    여부.
-  * `isEditable` Boolean - 컨텍스트를 편집할 수 있는지 여부.
-  * `editFlags` Object - 이 플래그는 랜더러가 다음 행동을 취할 수 있는지 여부를
-    표시합니다.
-    * `canUndo` - Boolean
-    * `canRedo` - Boolean
-    * `canCut` - Boolean
-    * `canCopy` - Boolean
-    * `canPaste` - Boolean
-    * `canDelete` - Boolean
-    * `canSelectAll` - Boolean
-  * `selectionText` String - 컨텍스트 메뉴가 호출된 부분에 있는 선택된 텍스트.
-  * `titleText` String - 컨텍스트 메뉴가 호출된 선택된 제목 또는 알림 텍스트.
-  * `misspelledWord` String - 만약 있는 경우, 커서가 가르키는 곳에서 발생한 오타.
-  * `frameCharset` String - 메뉴가 호출된 프레임의 문자열 인코딩.
-  * `inputFieldType` String - 컨텍스트 메뉴가 입력 필드에서 호출되었을 때, 그 필드의
-    타입. 값은 `none`, `plainText`, `password`, `other` 중 한 가지가 될 수 있습니다.
-  * `menuSourceType` String - 컨텍스트 메뉴를 호출한 입력 소스. 값은 `none`,
-    `mouse`, `keyboard`, `touch`, `touchMenu` 중 한 가지가 될 수 있습니다.
-
-새로운 컨텍스트 메뉴의 제어가 필요할 때 발생하는 이벤트입니다.
-
 ## Instance Methods
 
 `webContents`객체는 다음과 같은 인스턴스 메서드들을 가지고 있습니다.
@@ -372,7 +322,7 @@ Returns:
 하는 경우 `pragma` 헤더를 사용할 수 있습니다.
 
 ```javascript
-const options = {"extraHeaders" : "pragma: no-cache\n"}
+const options = {extraHeaders: 'pragma: no-cache\n'};
 webContents.loadURL(url, options)
 ```
 
@@ -389,7 +339,7 @@ webContents.loadURL(url, options)
 
 ```javascript
 let win = new BrowserWindow({width: 800, height: 600});
-win.loadURL("http://github.com");
+win.loadURL('http://github.com');
 
 let currentURL = win.webContents.getURL();
 ```
@@ -583,12 +533,12 @@ CSS 코드를 현재 웹 페이지에 삽입합니다.
 제공된 `action`에 대한 `webContents`의 모든 `findInPage` 요청을 중지합니다.
 
 ```javascript
-webContents.on('found-in-page', function(event, result) {
+webContents.on('found-in-page', (event, result) => {
   if (result.finalUpdate)
-    webContents.stopFindInPage("clearSelection");
+    webContents.stopFindInPage('clearSelection');
 });
 
-const requestId = webContents.findInPage("api");
+const requestId = webContents.findInPage('api');
 ```
 
 ### `webContents.hasServiceWorker(callback)`
@@ -626,7 +576,7 @@ print기능을 사용하지 않는 경우 전체 바이너리 크기를 줄이
 ### `webContents.printToPDF(options, callback)`
 
 * `options` Object
-  * `marginsType` Integer - 사용할 마진의 타입을 지정합니다. 0 부터 2 사이 값을 사용할
+  * `marginsType` Integer - 사용할 마진의 종류를 지정합니다. 0 부터 2 사이 값을 사용할
     수 있고 각각 기본 마진, 마진 없음, 최소 마진입니다.
   * `pageSize` String - 생성되는 PDF의 페이지 크기를 지정합니다. 값은 `A3`, `A4`,
     `A5`, `Legal`, `Letter` 와 `Tabloid`가 사용될 수 있습니다.
@@ -634,7 +584,7 @@ print기능을 사용하지 않는 경우 전체 바이너리 크기를 줄이
   * `printSelectionOnly` Boolean - 선택된 영역만 프린트할지 여부를 정합니다.
   * `landscape` Boolean - landscape을 위해선 `true`를, portrait를 위해선 `false`를
   	사용합니다.
-* `callback` Function - `function(error, data) {}`
+* `callback` Function - `(error, data) => {}`
 
 Chromium의 미리보기 프린팅 커스텀 설정을 이용하여 윈도우의 웹 페이지를 PDF로
 프린트합니다.
@@ -654,14 +604,14 @@ Chromium의 미리보기 프린팅 커스텀 설정을 이용하여 윈도우의
 ```
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const BrowserWindow = require('electron').BrowserWindow;
 const fs = require('fs');
 
 let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('http://github.com');
 
 win.webContents.on('did-finish-load', () => {
-  // 기본 프린트 옵션을 사용합니다
+  // Use default printing options
   win.webContents.printToPDF({}, (error, data) => {
     if (error) throw error;
     fs.writeFile('/tmp/print.pdf', data, (error) => {
@@ -681,8 +631,8 @@ win.webContents.on('did-finish-load', () => {
 이후에 사용해야 합니다.
 
 ```javascript
-mainWindow.webContents.on('devtools-opened', function() {
-  mainWindow.webContents.addWorkSpace(__dirname);
+win.webContents.on('devtools-opened', () => {
+  win.webContents.addWorkSpace(__dirname);
 });
 ```
 
@@ -696,9 +646,9 @@ mainWindow.webContents.on('devtools-opened', function() {
 
 * `options` Object (optional)
   * `detach` Boolean - 새 창에서 개발자 도구를 엽니다.
-  * `mode` String - 개발자 도구를 지정한 도킹 상태와 함께 엽니다. 옵션은 `right`,
-    `bottom`, `undocked`, `detach`가 될 수 있습니다. 기본값은 마지막 표시 상태를
-    사용합니다. `undocked` 모드에선 다시 도킹을 할 수 있습니다. 하지만 `detach`
+  * `mode` String - 개발자 도구 표시 상태를 지정합니다. 옵션은 "right", "bottom",
+    "undocked", "detach"가 될 수 있습니다. 기본값은 마지막 표시 상태를
+    사용합니다. `undocked` 모드에선 다시 독을 할 수 있습니다. 하지만 `detach`
     모드에선 할 수 없습니다.
 
 개발자 도구를 엽니다.
@@ -745,14 +695,13 @@ mainWindow.webContents.on('devtools-opened', function() {
 메인 프로세스에서 렌더러 프로세스로 메시지를 보내는 예시 입니다:
 
 ```javascript
-// 메인 프로세스에서.
-let mainWindow = null;
-
+// In the main process.
+let win = null;
 app.on('ready', () => {
-  mainWindow = new BrowserWindow({width: 800, height: 600});
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
-  mainWindow.webContents.on('did-finish-load', () => {
-    mainWindow.webContents.send('ping', 'whoooooooh!');
+  win = new BrowserWindow({width: 800, height: 600});
+  win.loadURL('file://' + __dirname + '/index.html');
+  win.webContents.on('did-finish-load', () => {
+    win.webContents.send('ping', 'whoooooooh!');
   });
 });
 ```
@@ -763,7 +712,7 @@ app.on('ready', () => {
 <body>
   <script>
     require('electron').ipcRenderer.on('ping', (event, message) => {
-      console.log(message);  // "whoooooooh!" 출력
+      console.log(message);  // Prints "whoooooooh!"
     });
   </script>
 </body>
@@ -871,7 +820,7 @@ Input `event`를 웹 페이지로 전송합니다.
   * `HTMLOnly` - 페이지의 HTML만 저장합니다.
   * `HTMLComplete` - 페이지의 완성된 HTML을 저장합니다.
   * `MHTML` - 페이지의 완성된 HTML을 MHTML로 저장합니다.
-* `callback` Function - `function(error) {}`.
+* `callback` Function - `(error) => {}`.
   * `error` Error
 
 만약 페이지를 저장하는 프로세스가 성공적으로 끝났을 경우 true를 반환합니다.
@@ -882,7 +831,7 @@ win.loadURL('https://github.com');
 win.webContents.on('did-finish-load', () => {
   win.webContents.savePage('/tmp/test.html', 'HTMLComplete', (error) => {
     if (!error)
-      console.log("Save page successfully");
+      console.log('Save page successfully');
   });
 });
 ```
@@ -912,23 +861,23 @@ win.webContents.on('did-finish-load', () => {
 
 ```javascript
 try {
-  win.webContents.debugger.attach("1.1");
+  win.webContents.debugger.attach('1.1');
 } catch(err) {
-  console.log("Debugger attach failed : ", err);
+  console.log('Debugger attach failed : ', err);
 };
 
 win.webContents.debugger.on('detach', (event, reason) => {
-  console.log("Debugger detached due to : ", reason);
+  console.log('Debugger detached due to : ', reason);
 });
 
 win.webContents.debugger.on('message', (event, method, params) => {
-  if (method === "Network.requestWillBeSent") {
-    if (params.request.url === "https://www.github.com")
+  if (method === 'Network.requestWillBeSent') {
+    if (params.request.url === 'https://www.github.com')
       win.webContents.debugger.detach();
   }
-})
+});
 
-win.webContents.debugger.sendCommand("Network.enable");
+win.webContents.debugger.sendCommand('Network.enable');
 ```
 
 #### `webContents.debugger.attach([protocolVersion])`
@@ -949,7 +898,7 @@ win.webContents.debugger.sendCommand("Network.enable");
 
 * `method` String - 메서드 이름, 반드시 원격 디버깅 프로토콜에 의해 정의된 메서드중
   하나가 됩니다.
-* `commandParams` Object (optional) - 요청 인수를 표현한 JSON 객체.
+* `commandParams` Object (optional) - 요청 매개변수를 표현한 JSON 객체.
 * `callback` Function (optional) - 응답
   * `error` Object -  커맨드의 실패를 표시하는 에러 메시지.
   * `result` Object - 원격 디버깅 프로토콜에서 커맨드 설명의 'returns' 속성에 의해
@@ -969,7 +918,8 @@ win.webContents.debugger.sendCommand("Network.enable");
 
 * `event` Event
 * `method` String - 메서드 이름.
-* `params` Object - 원격 디버깅 프로토콜의 'parameters' 속성에서 정의된 이벤트 인수
+* `params` Object - 원격 디버깅 프로토콜의 'parameters' 속성에서 정의된 이벤트
+  매개변수
 
 디버깅 타겟이 관련 이벤트를 발생시킬 때 마다 발생하는 이벤트입니다.
 
diff --git a/docs-translations/ko-KR/api/web-frame.md b/docs-translations/ko-KR/api/web-frame.md
index 73566b50bd32..69e563df3f59 100644
--- a/docs-translations/ko-KR/api/web-frame.md
+++ b/docs-translations/ko-KR/api/web-frame.md
@@ -5,7 +5,7 @@
 다음 예시는 현재 페이지를 200% 줌 합니다:
 
 ```javascript
-const { webFrame } = require('electron');
+const {webFrame} = require('electron');
 
 webFrame.setZoomFactor(2);
 ```
@@ -58,8 +58,8 @@ Input field나 text area에 철자 검사(spell checking) 제공자를 설정합
 [node-spellchecker][spellchecker]를 철자 검사 제공자로 사용하는 예시입니다:
 
 ```javascript
-webFrame.setSpellCheckProvider("en-US", true, {
-  spellCheck: function(text) {
+webFrame.setSpellCheckProvider('en-US', true, {
+  spellCheck(text) {
     return !(require('spellchecker').isMisspelled(text));
   }
 });
diff --git a/docs-translations/ko-KR/api/web-view-tag.md b/docs-translations/ko-KR/api/web-view-tag.md
index ab56e2c96a4a..3191db71331e 100644
--- a/docs-translations/ko-KR/api/web-view-tag.md
+++ b/docs-translations/ko-KR/api/web-view-tag.md
@@ -35,15 +35,15 @@
 
     const loadstart = () => {
       indicator.innerText = 'loading...';
-    }
+    };
 
     const loadstop = () => {
       indicator.innerText = '';
-    }
+    };
 
     webview.addEventListener('did-start-loading', loadstart);
     webview.addEventListener('did-stop-loading', loadstop);
-  }
+  };
 </script>
 ```
 
@@ -207,7 +207,7 @@ API를 사용할 수 있습니다. 이를 지정하면 내부에서 로우레벨
 **예시**
 
 ```javascript
-webview.addEventListener("dom-ready", () => {
+webview.addEventListener('dom-ready', () => {
   webview.openDevTools();
 });
 ```
@@ -590,7 +590,7 @@ Returns:
 콘솔에 다시 로깅하는 예시입니다.
 
 ```javascript
-webview.addEventListener('console-message', function(e) {
+webview.addEventListener('console-message', (e) => {
   console.log('Guest page logged a message:', e.message);
 });
 ```
@@ -610,12 +610,12 @@ Returns:
 사용할 수 있을 때 발생하는 이벤트입니다.
 
 ```javascript
-webview.addEventListener('found-in-page', function(e) {
+webview.addEventListener('found-in-page', (e) => {
   if (e.result.finalUpdate)
-    webview.stopFindInPage("keepSelection");
+    webview.stopFindInPage('keepSelection');
 });
 
-const rquestId = webview.findInPage("test");
+const rquestId = webview.findInPage('test');
 ```
 
 ### Event: 'new-window'
@@ -633,7 +633,7 @@ Returns:
 다음 예시 코드는 새 URL을 시스템의 기본 브라우저로 여는 코드입니다.
 
 ```javascript
-const { shell } = require('electron');
+const {shell} = require('electron');
 
 webview.addEventListener('new-window', (e) => {
   const protocol = require('url').parse(e.url).protocol;
@@ -719,7 +719,7 @@ webview.send('ping');
 
 ```javascript
 // In guest page.
-var { ipcRenderer } = require('electron');
+const {ipcRenderer} = require('electron');
 ipcRenderer.on('ping', () => {
   ipcRenderer.sendToHost('pong');
 });
diff --git a/docs-translations/ko-KR/faq/electron-faq.md b/docs-translations/ko-KR/faq/electron-faq.md
index f74867caded2..38235e2d8980 100644
--- a/docs-translations/ko-KR/faq/electron-faq.md
+++ b/docs-translations/ko-KR/faq/electron-faq.md
@@ -64,7 +64,7 @@ console.log(require('remote').getGlobal('sharedObject').someProperty);
 ```javascript
 app.on('ready', () => {
   const tray = new Tray('/path/to/icon.png');
-})
+});
 ```
 
 를 이렇게:
@@ -73,7 +73,7 @@ app.on('ready', () => {
 let tray = null;
 app.on('ready', () => {
   tray = new Tray('/path/to/icon.png');
-})
+});
 ```
 
 ## Electron에서 jQuery/RequireJS/Meteor/AngularJS를 사용할 수 없습니다.
@@ -86,7 +86,7 @@ Node.js가 Electron에 합쳐졌기 때문에, DOM에 `module`, `exports`, `requ
 
 ```javascript
 // 메인 프로세스에서.
-let mainWindow = new BrowserWindow({
+let win = new BrowserWindow({
   webPreferences: {
     nodeIntegration: false
   }
diff --git a/docs-translations/ko-KR/styleguide.md b/docs-translations/ko-KR/styleguide.md
index bf9eba1ee2d6..340fa4204a05 100644
--- a/docs-translations/ko-KR/styleguide.md
+++ b/docs-translations/ko-KR/styleguide.md
@@ -94,5 +94,5 @@ Returns:
 ```javascript
 Alarm.on('wake-up', (time) => {
   console.log(time)
-})
+});
 ```
diff --git a/docs-translations/ko-KR/tutorial/application-packaging.md b/docs-translations/ko-KR/tutorial/application-packaging.md
index 2cef8ea9c70d..8002350b56b1 100644
--- a/docs-translations/ko-KR/tutorial/application-packaging.md
+++ b/docs-translations/ko-KR/tutorial/application-packaging.md
@@ -70,7 +70,7 @@ require('/path/to/example.asar/dir/module.js');
 `BrowserWindow` 클래스를 이용해 원하는 웹 페이지도 표시할 수 있습니다:
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('file:///path/to/example.asar/static/index.html');
 ```
@@ -84,7 +84,7 @@ win.loadURL('file:///path/to/example.asar/static/index.html');
 
 ```html
 <script>
-var $ = require('./jquery.min.js');
+let $ = require('./jquery.min.js');
 $.get('file:///path/to/example.asar/file.txt', (data) => {
   console.log(data);
 });
diff --git a/docs-translations/ko-KR/tutorial/desktop-environment-integration.md b/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
index 46bd5dae01bd..beece23e3f75 100644
--- a/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
+++ b/docs-translations/ko-KR/tutorial/desktop-environment-integration.md
@@ -21,9 +21,9 @@ let myNotification = new Notification('Title', {
   body: 'Lorem Ipsum Dolor Sit Amet'
 });
 
-myNotification.onclick = function () {
-  console.log('Notification clicked')
-}
+myNotification.onclick = () => {
+  console.log('Notification clicked');
+};
 ```
 
 위 코드를 통해 생성한 데스크톱 알림은 각 운영체제 모두 비슷한 사용자 경험을 제공하지만,
@@ -110,18 +110,17 @@ __Terminal.app의 dock menu:__
 OS X에서만 사용 가능합니다:
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const Menu = electron.Menu;
+const {app, Menu} = require('electron');
 
 const dockMenu = Menu.buildFromTemplate([
-  { label: 'New Window', click: () => { console.log('New Window'); } },
-  { label: 'New Window with Settings', submenu: [
-    { label: 'Basic' },
-    { label: 'Pro'}
+  {label: 'New Window', click() { console.log('New Window'); }},
+  {label: 'New Window with Settings', submenu: [
+    {label: 'Basic'},
+    {label: 'Pro'}
   ]},
-  { label: 'New Command...'}
+  {label: 'New Command...'}
 ]);
+
 app.dock.setMenu(dockMenu);
 ```
 
@@ -203,7 +202,7 @@ __Windows Media Player의 미리보기 툴바:__
 미리보기 툴바를 설정할 수 있습니다:
 
 ```javascript
-const { BrowserWindow } = require('electron');
+const {BrowserWindow} = require('electron');
 const path = require('path');
 
 let win = new BrowserWindow({
@@ -213,15 +212,15 @@ let win = new BrowserWindow({
 
 win.setThumbarButtons([
   {
-    tooltip: "button1",
+    tooltip: 'button1',
     icon: path.join(__dirname, 'button1.png'),
-    click: () => { console.log("button2 clicked"); }
+    click() { console.log('button2 clicked'); }
   },
   {
-    tooltip: "button2",
+    tooltip: 'button2',
     icon: path.join(__dirname, 'button2.png'),
     flags:['enabled', 'dismissonclick'],
-    click: () => { console.log("button2 clicked."); }
+    click() { console.log('button2 clicked.'); }
   }
 ]);
 ```
@@ -260,8 +259,8 @@ __작업 표시줄 버튼의 프로그래스 바:__
 있습니다:
 
 ```javascript
-let window = new BrowserWindow({...});
-window.setProgressBar(0.5);
+let win = new BrowserWindow({...});
+win.setProgressBar(0.5);
 ```
 
 ## 작업 표시줄의 아이콘 오버레이 (Windows)
@@ -287,8 +286,8 @@ __작업 표시줄 버튼 위의 오버레이:__
 API를 사용할 수 있습니다:
 
 ```javascript
-let window = new BrowserWindow({...});
-window.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
+let win = new BrowserWindow({...});
+win.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
 ```
 
 ## 대표 파일 제시 (OS X)
@@ -306,9 +305,9 @@ __대표 파일 팝업 메뉴:__
 [BrowserWindow.setDocumentEdited][setdocumentedited]를 사용할 수 있습니다:
 
 ```javascript
-let window = new BrowserWindow({...});
-window.setRepresentedFilename('/etc/passwd');
-window.setDocumentEdited(true);
+let win = new BrowserWindow({...});
+win.setRepresentedFilename('/etc/passwd');
+win.setDocumentEdited(true);
 ```
 
 [addrecentdocument]: ../api/app.md#appaddrecentdocumentpath-os-x-windows
diff --git a/docs-translations/ko-KR/tutorial/online-offline-events.md b/docs-translations/ko-KR/tutorial/online-offline-events.md
index 75dcf05805b5..de2e10f9efe9 100644
--- a/docs-translations/ko-KR/tutorial/online-offline-events.md
+++ b/docs-translations/ko-KR/tutorial/online-offline-events.md
@@ -6,14 +6,12 @@
 _main.js_
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const BrowserWindow = electron.BrowserWindow;
+const {app, BrowserWindow} = require('electron');
 
 let onlineStatusWindow;
 
 app.on('ready', () => {
-  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
+  onlineStatusWindow = new BrowserWindow({width: 0, height: 0, show: false});
   onlineStatusWindow.loadURL('file://' + __dirname + '/online-status.html');
 });
 ```
@@ -48,15 +46,12 @@ _online-status.html_
 _main.js_
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const ipcMain = electron.ipcMain;
-const BrowserWindow = electron.BrowserWindow;
+const {app, ipcMain, BrowserWindow} = require('electron');
 
 let onlineStatusWindow;
 
 app.on('ready', () => {
-  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
+  onlineStatusWindow = new BrowserWindow({width: 0, height: 0, show: false});
   onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`);
 });
 
@@ -72,7 +67,7 @@ _online-status.html_
 <html>
 <body>
 <script>
-  const { ipcRenderer } = require('electron');
+  const {ipcRenderer} = require('electron');
   const updateOnlineStatus = () => {
     ipcRenderer.send('online-status-changed', navigator.onLine ? 'online' : 'offline');
   };
diff --git a/docs-translations/ko-KR/tutorial/quick-start.md b/docs-translations/ko-KR/tutorial/quick-start.md
index 730c858237e0..48e76d5cd54f 100644
--- a/docs-translations/ko-KR/tutorial/quick-start.md
+++ b/docs-translations/ko-KR/tutorial/quick-start.md
@@ -77,30 +77,30 @@ __알림__: 만약 `main` 필드가 `package.json`에 설정되어 있지 않으
 ```javascript
 const electron = require('electron');
 // 어플리케이션 생명주기를 조작 하는 모듈.
-const app = electron.app;
+const {app} = electron;
 // 네이티브 브라우저 창을 만드는 모듈.
-const BrowserWindow = electron.BrowserWindow;
+const {BrowserWindow} = electron;
 
 // 윈도우 객체를 전역에 유지합니다. 만약 이렇게 하지 않으면
 // 자바스크립트 GC가 일어날 때 창이 멋대로 닫혀버립니다.
-let mainWindow;
+let win;
 
 function createWindow () {
   // 새로운 브라우저 창을 생성합니다.
-  mainWindow = new BrowserWindow({width: 800, height: 600});
+  win = new BrowserWindow({width: 800, height: 600});
 
   // 그리고 현재 디렉터리의 index.html을 로드합니다.
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  win.loadURL(`file://${__dirname}/index.html`);
 
   // 개발자 도구를 엽니다.
-  mainWindow.webContents.openDevTools();
+  win.webContents.openDevTools();
 
   // 창이 닫히면 호출됩니다.
-  mainWindow.on('closed', () => {
+  win.on('closed', () => {
     // 윈도우 객체의 참조를 삭제합니다. 보통 멀티 윈도우 지원을 위해
     // 윈도우 객체를 배열에 저장하는 경우가 있는데 이 경우
     // 해당하는 모든 윈도우 객체의 참조를 삭제해 주어야 합니다.
-    mainWindow = null;
+    win = null;
   });
 }
 
@@ -121,7 +121,7 @@ app.on('window-all-closed', () => {
 app.on('activate', () => {
   // OS X에선 보통 독 아이콘이 클릭되고 나서도
   // 열린 윈도우가 없으면, 새로운 윈도우를 다시 만듭니다.
-  if (mainWindow === null) {
+  if (win === null) {
     createWindow();
   }
 });
diff --git a/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md b/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md
index 8ec73b811f89..c892d154e5a5 100644
--- a/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md
+++ b/docs-translations/ko-KR/tutorial/using-pepper-flash-plugin.md
@@ -27,14 +27,14 @@ app.commandLine.appendSwitch('ppapi-flash-path', '/path/to/libpepflashplayer.so'
 app.commandLine.appendSwitch('ppapi-flash-version', '17.0.0.169');
 
 app.on('ready', () => {
-  mainWindow = new BrowserWindow({
+  win = new BrowserWindow({
     width: 800,
     height: 600,
     webPreferences: {
       plugins: true
     }
   });
-  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  win.loadURL(`file://${__dirname}/index.html`);
   // 이외의 코드
 });
 ```
diff --git a/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md b/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
index e57bcf229d43..baa5dd719f60 100644
--- a/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
+++ b/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
@@ -93,7 +93,7 @@ $ npm install webdriverio
 ```javascript
 const webdriverio = require('webdriverio');
 let options = {
-  host: "localhost", // localhost에서 작동중인 크롬 드라이버 서버를 사용합니다.
+  host: 'localhost', // localhost에서 작동중인 크롬 드라이버 서버를 사용합니다.
   port: 9515,        // 연결할 크롬 드라이버 서버의 포트를 설정합니다.
   desiredCapabilities: {
     browserName: 'chrome',
diff --git a/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md b/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md
index 7de590abb07b..6031857efeab 100644
--- a/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md
+++ b/docs-translations/ko-KR/tutorial/using-widevine-cdm-plugin.md
@@ -59,14 +59,14 @@ app.commandLine.appendSwitch('widevine-cdm-path', '/path/to/widevinecdmadapter.p
 // 플러그인의 버전은 크롬의 `chrome://plugins` 페이지에서 취득할 수 있습니다.
 app.commandLine.appendSwitch('widevine-cdm-version', '1.4.8.866');
 
-let mainWindow = null;
+let win = null;
 app.on('ready', () => {
-  mainWindow = new BrowserWindow({
+  win = new BrowserWindow({
     webPreferences: {
       // `plugins`은 활성화되어야 합니다.
       plugins: true
     }
-  })
+  });
 });
 ```
 

From ebc7f5cba096dd554e5009ea482440699c21080a Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 03:34:06 +0900
Subject: [PATCH 087/510] :memo: Remove whitespace

[ci skip]
---
 docs/api/app.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 7cf301533e26..36ebab21bedf 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -7,7 +7,6 @@ closed:
 
 ```javascript
 const {app} = require('electron');
-
 app.on('window-all-closed', () => {
   app.quit();
 });

From 6dae07b76fb4e559eb0c76984f5dbef48ed4ae48 Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Tue, 10 May 2016 15:02:56 -0400
Subject: [PATCH 088/510] Add API: app.dock.downloadFinished(filePath)

---
 atom/browser/api/atom_api_app.cc | 2 ++
 atom/browser/browser.h           | 3 +++
 atom/browser/browser_mac.mm      | 6 ++++++
 docs/api/app.md                  | 6 ++++++
 lib/browser/api/app.js           | 1 +
 5 files changed, 18 insertions(+)

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 52a6926d1a9b..835a2b52f20b 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -546,6 +546,8 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   dict.SetMethod("dockBounce", &DockBounce);
   dict.SetMethod("dockCancelBounce",
                  base::Bind(&Browser::DockCancelBounce, browser));
+  dict.SetMethod("dockDownloadFinished",
+                 base::Bind(&Browser::DockDownloadFinished, browser));
   dict.SetMethod("dockSetBadgeText",
                  base::Bind(&Browser::DockSetBadgeText, browser));
   dict.SetMethod("dockGetBadgeText",
diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index eb8d2865ad82..1c70eb875906 100644
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -111,6 +111,9 @@ class Browser : public WindowListObserver {
   int DockBounce(BounceType type);
   void DockCancelBounce(int request_id);
 
+  // Bounce the Downloads stack.
+  void DockDownloadFinished(const std::string& filePath);
+
   // Set/Get dock's badge text.
   void DockSetBadgeText(const std::string& label);
   std::string DockGetBadgeText();
diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index eb7191b67a23..477a132be6af 100644
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -134,6 +134,12 @@ void Browser::DockSetBadgeText(const std::string& label) {
   [tile setBadgeLabel:base::SysUTF8ToNSString(label)];
 }
 
+void Browser::DockDownloadFinished(const std::string& filePath) {
+  [[NSDistributedNotificationCenter defaultCenter]
+      postNotificationName: @"com.apple.DownloadFileFinished"
+                    object: base::SysUTF8ToNSString(filePath)];
+}
+
 std::string Browser::DockGetBadgeText() {
   NSDockTile *tile = [[AtomApplication sharedApplication] dockTile];
   return base::SysNSStringToUTF8([tile badgeLabel]);
diff --git a/docs/api/app.md b/docs/api/app.md
index c6c5887ef623..7f928bb5b1ce 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -566,6 +566,12 @@ Returns an ID representing the request.
 
 Cancel the bounce of `id`.
 
+### `app.dock.downloadFinished(filePath)` _OS X_
+
+* `filePath` String
+
+Bounces the Downloads stack if the filePath is inside the Downloads folder.
+
 ### `app.dock.setBadge(text)` _OS X_
 
 * `text` String
diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 0487270ce7b3..f8bff4b8a72c 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -32,6 +32,7 @@ if (process.platform === 'darwin') {
       return bindings.dockBounce(type)
     },
     cancelBounce: bindings.dockCancelBounce,
+    downloadFinished: bindings.dockDownloadFinished,
     setBadge: bindings.dockSetBadgeText,
     getBadge: bindings.dockGetBadgeText,
     hide: bindings.dockHide,

From b54af73782546173e92ee2772ffb2c7b87483c1a Mon Sep 17 00:00:00 2001
From: Nick Taylor <nick@weareadaptive.com>
Date: Tue, 10 May 2016 22:32:45 +0200
Subject: [PATCH 089/510] fixed code snippet in menu api documentation.

---
 docs/api/menu.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/api/menu.md b/docs/api/menu.md
index 944a4f810933..a80ea8723129 100644
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -15,7 +15,8 @@ the user right clicks the page:
 ```html
 <!-- index.html -->
 <script>
-const { Menu, MenuItem } = require('electron').remote;
+const { remote } = require('electron');
+const { Menu, MenuItem } = remote;
 
 const menu = new Menu();
 menu.append(new MenuItem({ label: 'MenuItem1', click: () => { console.log('item 1 clicked'); } }));

From 0dad2581efbcd300101aa7f4e3d54abe0eda84f1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 08:47:50 +0900
Subject: [PATCH 090/510] Fix passing paths in command line

---
 atom/app/atom_content_client.cc  | 11 +++++------
 atom/browser/api/atom_api_app.cc |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index 8f59c77768c6..705573abe5d2 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -126,7 +126,7 @@ void ConvertStringWithSeparatorToVector(std::vector<std::string>* vec,
 void AddPepperFlashFromCommandLine(
     std::vector<content::PepperPluginInfo>* plugins) {
   auto command_line = base::CommandLine::ForCurrentProcess();
-  auto flash_path = command_line->GetSwitchValueNative(
+  base::FilePath flash_path = command_line->GetSwitchValuePath(
       switches::kPpapiFlashPath);
   if (flash_path.empty())
     return;
@@ -134,20 +134,19 @@ void AddPepperFlashFromCommandLine(
   auto flash_version = command_line->GetSwitchValueASCII(
       switches::kPpapiFlashVersion);
 
-  plugins->push_back(
-      CreatePepperFlashInfo(base::FilePath(flash_path), flash_version));
+  plugins->push_back(CreatePepperFlashInfo(flash_path, flash_version));
 }
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 void AddWidevineCdmFromCommandLine(
     std::vector<content::PepperPluginInfo>* plugins) {
   auto command_line = base::CommandLine::ForCurrentProcess();
-  auto widevine_cdm_path = command_line->GetSwitchValueNative(
+  base::FilePath widevine_cdm_path = command_line->GetSwitchValuePath(
       switches::kWidevineCdmPath);
   if (widevine_cdm_path.empty())
     return;
 
-  if (!base::PathExists(base::FilePath(widevine_cdm_path)))
+  if (!base::PathExists(widevine_cdm_path))
     return;
 
   auto widevine_cdm_version = command_line->GetSwitchValueASCII(
@@ -155,7 +154,7 @@ void AddWidevineCdmFromCommandLine(
   if (widevine_cdm_version.empty())
     return;
 
-  plugins->push_back(CreateWidevineCdmInfo(base::FilePath(widevine_cdm_path),
+  plugins->push_back(CreateWidevineCdmInfo(widevine_cdm_path,
                                            widevine_cdm_version));
 }
 #endif
diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 52a6926d1a9b..4d587d9f0b64 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -27,6 +27,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
+#include "base/strings/string_util.h"
 #include "brightray/browser/brightray_paths.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/client_certificate_delegate.h"
@@ -500,7 +501,8 @@ namespace {
 void AppendSwitch(const std::string& switch_string, mate::Arguments* args) {
   auto command_line = base::CommandLine::ForCurrentProcess();
 
-  if (switch_string == atom::switches::kPpapiFlashPath ||
+  if (base::EndsWith(switch_string, "-path",
+                     base::CompareCase::INSENSITIVE_ASCII) ||
       switch_string == switches::kLogNetLog) {
     base::FilePath path;
     args->GetNext(&path);

From 4cdba29fbd5ebdf90a027499af85bb23fb688713 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 10:30:02 +0900
Subject: [PATCH 091/510] :memo: Match object notation style

[ci skip]
---
 docs/api/session.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/session.md b/docs/api/session.md
index 76ba4a611b0f..33a53df5844e 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -89,13 +89,13 @@ session.defaultSession.cookies.get({}, (error, cookies) => {
 });
 
 // Query all cookies associated with a specific url.
-session.defaultSession.cookies.get({url : 'http://www.github.com'}, (error, cookies) => {
+session.defaultSession.cookies.get({url: 'http://www.github.com'}, (error, cookies) => {
   console.log(cookies);
 });
 
 // Set a cookie with the given cookie data;
 // may overwrite equivalent cookies if they exist.
-const cookie = {url : 'http://www.github.com', name : 'dummy_name', value : 'dummy'};
+const cookie = {url: 'http://www.github.com', name: 'dummy_name', value: 'dummy'};
 session.defaultSession.cookies.set(cookie, (error) => {
   if (error)
     console.error(error);

From 01c483e0dd5f675fdc2b1df13d83efe0224e0266 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 10:48:54 +0900
Subject: [PATCH 092/510] :memo: Update `README-ko.md`

[ci skip]
---
 README-ko.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README-ko.md b/README-ko.md
index 5f809bbf05f9..bb7684e9d53a 100644
--- a/README-ko.md
+++ b/README-ko.md
@@ -1,7 +1,7 @@
 [![Electron Logo](http://electron.atom.io/images/electron-logo.svg)](http://electron.atom.io/)
 
 [![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/qtmod45u0cc1ouov/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/electron)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/kvxe4byi7jcxbe26/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/electron)
 [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron#info=devDependencies)
 [![Join the Electron Community on Slack](http://atom-slack.herokuapp.com/badge.svg)](http://atom-slack.herokuapp.com/)
 

From 95c9e488222dbdec9806bd97131b2530d2171f86 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 11 May 2016 13:48:40 +0900
Subject: [PATCH 093/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/api/app.md  | 10 ++++++++--
 docs-translations/ko-KR/api/menu.md |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs-translations/ko-KR/api/app.md b/docs-translations/ko-KR/api/app.md
index 52a7baa308ef..b0bf4d73601c 100644
--- a/docs-translations/ko-KR/api/app.md
+++ b/docs-translations/ko-KR/api/app.md
@@ -558,7 +558,7 @@ Chrominum의 명령줄에 인수를 추가합니다. 인수는 올바르게 인
   기본값은 `informational` 입니다.
 
 `critical`이 전달되면 dock 아이콘이 어플리케이션이 활성화되거나 요청이 중지되기 전까지
-통통 튑니다.
+통통 튀는 바운스 효과를 적용합니다.
 
 `informational`이 전달되면 dock 아이콘이 1초만 통통 튑니다. 하지만 어플리케이션이
 활성화되거나 요청이 중지되기 전까지 요청은 계속 활성화로 유지 됩니다.
@@ -569,7 +569,13 @@ Chrominum의 명령줄에 인수를 추가합니다. 인수는 올바르게 인
 
 * `id` Integer
 
-`app.dock.bounce([type])` 메서드에서 반환한 `id`의 통통 튀는 효과를 취소합니다.
+`app.dock.bounce([type])` 메서드에서 반환한 `id`의 바운스 효과를 취소합니다.
+
+### `app.dock.downloadFinished(filePath)` _OS X_
+
+* `filePath` String
+
+`filePath`가 다운로드 폴더에 들어있다면 다운로드 스택을 바운스합니다.
 
 ### `app.dock.setBadge(text)` _OS X_
 
diff --git a/docs-translations/ko-KR/api/menu.md b/docs-translations/ko-KR/api/menu.md
index df3ed0717166..e627a9a87a4b 100644
--- a/docs-translations/ko-KR/api/menu.md
+++ b/docs-translations/ko-KR/api/menu.md
@@ -14,7 +14,8 @@
 ```html
 <!-- index.html -->
 <script>
-const {Menu, MenuItem} = require('electron').remote;
+const {remote} = require('electron');
+const {Menu, MenuItem} = remote;
 
 const menu = new Menu();
 menu.append(new MenuItem({label: 'MenuItem1', click() { console.log('item 1 clicked'); }}));

From e5890728dc66500c289ff68fcd6a14a204d97934 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 15:07:09 +0900
Subject: [PATCH 094/510] Do not use require('app') in dump-version-info.js

---
 tools/dump-version-info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/dump-version-info.js b/tools/dump-version-info.js
index b5df69f4e9b1..8b0255352e1f 100644
--- a/tools/dump-version-info.js
+++ b/tools/dump-version-info.js
@@ -1,4 +1,4 @@
-var app = require('app')
+var app = require('electron').app
 var fs = require('fs')
 var request = require('request')
 

From 7f2a46cdd5d722fbdbca0f005b2ccd817b60d2ca Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 12:24:02 +0900
Subject: [PATCH 095/510] Remove unused methods of IDWeakMap

---
 atom/common/api/atom_api_id_weak_map.cc |  7 +------
 atom/common/api/atom_api_id_weak_map.h  |  1 -
 atom/common/id_weak_map.cc              | 12 ------------
 atom/common/id_weak_map.h               |  6 ------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/atom/common/api/atom_api_id_weak_map.cc b/atom/common/api/atom_api_id_weak_map.cc
index 0d3ddae3cc09..1669f25373c9 100644
--- a/atom/common/api/atom_api_id_weak_map.cc
+++ b/atom/common/api/atom_api_id_weak_map.cc
@@ -36,10 +36,6 @@ void IDWeakMap::Remove(int32_t id) {
   id_weak_map_.Remove(id);
 }
 
-void IDWeakMap::Clear() {
-  id_weak_map_.Clear();
-}
-
 // static
 void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
                                v8::Local<v8::ObjectTemplate> prototype) {
@@ -47,8 +43,7 @@ void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("set", &IDWeakMap::Set)
       .SetMethod("get", &IDWeakMap::Get)
       .SetMethod("has", &IDWeakMap::Has)
-      .SetMethod("remove", &IDWeakMap::Remove)
-      .SetMethod("clear", &IDWeakMap::Clear);
+      .SetMethod("remove", &IDWeakMap::Remove);
 }
 
 // static
diff --git a/atom/common/api/atom_api_id_weak_map.h b/atom/common/api/atom_api_id_weak_map.h
index 616112ffe6f4..0151c7cea479 100644
--- a/atom/common/api/atom_api_id_weak_map.h
+++ b/atom/common/api/atom_api_id_weak_map.h
@@ -30,7 +30,6 @@ class IDWeakMap : public mate::Wrappable<IDWeakMap> {
   v8::Local<v8::Object> Get(v8::Isolate* isolate, int32_t id);
   bool Has(int32_t id);
   void Remove(int32_t id);
-  void Clear();
 
   atom::IDWeakMap id_weak_map_;
 
diff --git a/atom/common/id_weak_map.cc b/atom/common/id_weak_map.cc
index a78dcbceba53..f7c3f98ea3d3 100644
--- a/atom/common/id_weak_map.cc
+++ b/atom/common/id_weak_map.cc
@@ -59,14 +59,6 @@ bool IDWeakMap::Has(int32_t id) const {
   return map_.find(id) != map_.end();
 }
 
-std::vector<int32_t> IDWeakMap::Keys() const {
-  std::vector<int32_t> keys;
-  keys.reserve(map_.size());
-  for (const auto& iter : map_)
-    keys.emplace_back(iter.first);
-  return keys;
-}
-
 std::vector<v8::Local<v8::Object>> IDWeakMap::Values(v8::Isolate* isolate) {
   std::vector<v8::Local<v8::Object>> keys;
   keys.reserve(map_.size());
@@ -83,10 +75,6 @@ void IDWeakMap::Remove(int32_t id) {
     map_.erase(iter);
 }
 
-void IDWeakMap::Clear() {
-  map_.clear();
-}
-
 int32_t IDWeakMap::GetNextID() {
   return ++next_id_;
 }
diff --git a/atom/common/id_weak_map.h b/atom/common/id_weak_map.h
index 72c64c6ae5d4..f92270573fa6 100644
--- a/atom/common/id_weak_map.h
+++ b/atom/common/id_weak_map.h
@@ -31,18 +31,12 @@ class IDWeakMap {
   // Whethere there is an object with |id| in this WeakMap.
   bool Has(int32_t id) const;
 
-  // Returns IDs of all available objects.
-  std::vector<int32_t> Keys() const;
-
   // Returns all objects.
   std::vector<v8::Local<v8::Object>> Values(v8::Isolate* isolate);
 
   // Remove object with |id| in the WeakMap.
   void Remove(int32_t key);
 
-  // Clears the weak map.
-  void Clear();
-
  private:
   // Returns next available ID.
   int32_t GetNextID();

From 79c1ad85f9b8a91269066294fb922dae4dcfd7c8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 13:40:33 +0900
Subject: [PATCH 096/510] Add KeyWeakMap without Add method

---
 atom/common/id_weak_map.cc | 36 +++++++++++++++++++++---------------
 atom/common/id_weak_map.h  | 28 +++++++++++++++++++---------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/atom/common/id_weak_map.cc b/atom/common/id_weak_map.cc
index f7c3f98ea3d3..2067585eb8f5 100644
--- a/atom/common/id_weak_map.cc
+++ b/atom/common/id_weak_map.cc
@@ -13,9 +13,9 @@ namespace atom {
 namespace {
 
 struct ObjectKey {
-  ObjectKey(int id, IDWeakMap* map) : id(id), map(map) {}
+  ObjectKey(int id, KeyWeakMap* map) : id(id), map(map) {}
   int id;
-  IDWeakMap* map;
+  KeyWeakMap* map;
 };
 
 void OnObjectGC(const v8::WeakCallbackInfo<ObjectKey>& data) {
@@ -26,13 +26,13 @@ void OnObjectGC(const v8::WeakCallbackInfo<ObjectKey>& data) {
 
 }  // namespace
 
-IDWeakMap::IDWeakMap() : next_id_(0) {
+KeyWeakMap::KeyWeakMap() {
 }
 
-IDWeakMap::~IDWeakMap() {
+KeyWeakMap::~KeyWeakMap() {
 }
 
-void IDWeakMap::Set(v8::Isolate* isolate,
+void KeyWeakMap::Set(v8::Isolate* isolate,
                     int32_t id,
                     v8::Local<v8::Object> object) {
   auto global = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
@@ -41,13 +41,7 @@ void IDWeakMap::Set(v8::Isolate* isolate,
   map_[id] = global;
 }
 
-int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Local<v8::Object> object) {
-  int32_t id = GetNextID();
-  Set(isolate, id, object);
-  return id;
-}
-
-v8::MaybeLocal<v8::Object> IDWeakMap::Get(v8::Isolate* isolate, int32_t id) {
+v8::MaybeLocal<v8::Object> KeyWeakMap::Get(v8::Isolate* isolate, int32_t id) {
   auto iter = map_.find(id);
   if (iter == map_.end())
     return v8::MaybeLocal<v8::Object>();
@@ -55,11 +49,11 @@ v8::MaybeLocal<v8::Object> IDWeakMap::Get(v8::Isolate* isolate, int32_t id) {
     return v8::Local<v8::Object>::New(isolate, *iter->second);
 }
 
-bool IDWeakMap::Has(int32_t id) const {
+bool KeyWeakMap::Has(int32_t id) const {
   return map_.find(id) != map_.end();
 }
 
-std::vector<v8::Local<v8::Object>> IDWeakMap::Values(v8::Isolate* isolate) {
+std::vector<v8::Local<v8::Object>> KeyWeakMap::Values(v8::Isolate* isolate) {
   std::vector<v8::Local<v8::Object>> keys;
   keys.reserve(map_.size());
   for (const auto& iter : map_)
@@ -67,7 +61,7 @@ std::vector<v8::Local<v8::Object>> IDWeakMap::Values(v8::Isolate* isolate) {
   return keys;
 }
 
-void IDWeakMap::Remove(int32_t id) {
+void KeyWeakMap::Remove(int32_t id) {
   auto iter = map_.find(id);
   if (iter == map_.end())
     LOG(WARNING) << "Removing unexist object with ID " << id;
@@ -75,6 +69,18 @@ void IDWeakMap::Remove(int32_t id) {
     map_.erase(iter);
 }
 
+IDWeakMap::IDWeakMap() : next_id_(0) {
+}
+
+IDWeakMap::~IDWeakMap() {
+}
+
+int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Local<v8::Object> object) {
+  int32_t id = GetNextID();
+  Set(isolate, id, object);
+  return id;
+}
+
 int32_t IDWeakMap::GetNextID() {
   return ++next_id_;
 }
diff --git a/atom/common/id_weak_map.h b/atom/common/id_weak_map.h
index f92270573fa6..a3c49b2346c7 100644
--- a/atom/common/id_weak_map.h
+++ b/atom/common/id_weak_map.h
@@ -14,17 +14,14 @@
 namespace atom {
 
 // Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer.
-class IDWeakMap {
+class KeyWeakMap {
  public:
-  IDWeakMap();
-  ~IDWeakMap();
+  KeyWeakMap();
+  virtual ~KeyWeakMap();
 
   // Sets the object to WeakMap with the given |id|.
   void Set(v8::Isolate* isolate, int32_t id, v8::Local<v8::Object> object);
 
-  // Adds |object| to WeakMap and returns its allocated |id|.
-  int32_t Add(v8::Isolate* isolate, v8::Local<v8::Object> object);
-
   // Gets the object from WeakMap by its |id|.
   v8::MaybeLocal<v8::Object> Get(v8::Isolate* isolate, int32_t id);
 
@@ -37,6 +34,22 @@ class IDWeakMap {
   // Remove object with |id| in the WeakMap.
   void Remove(int32_t key);
 
+ private:
+  // Map of stored objects.
+  std::unordered_map<int32_t, linked_ptr<v8::Global<v8::Object>>> map_;
+
+  DISALLOW_COPY_AND_ASSIGN(KeyWeakMap);
+};
+
+// Provides key increments service in addition to KeyWeakMap.
+class IDWeakMap : public KeyWeakMap {
+ public:
+  IDWeakMap();
+  ~IDWeakMap() override;
+
+  // Adds |object| to WeakMap and returns its allocated |id|.
+  int32_t Add(v8::Isolate* isolate, v8::Local<v8::Object> object);
+
  private:
   // Returns next available ID.
   int32_t GetNextID();
@@ -44,9 +57,6 @@ class IDWeakMap {
   // ID of next stored object.
   int32_t next_id_;
 
-  // Map of stored objects.
-  std::unordered_map<int32_t, linked_ptr<v8::Global<v8::Object>>> map_;
-
   DISALLOW_COPY_AND_ASSIGN(IDWeakMap);
 };
 

From e6c0b1fe0c13c59e0c783dd4c0d6cf7a88b0b859 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 14:26:32 +0900
Subject: [PATCH 097/510] Fix leak when KeyWeakMap::Remove is called directly

Usually the KeyObject would be destroyed when GC happens, but then
Remove is called before GC happens, the KeyObject would be leaked
forever. This fixes it by keeping KeyObject as a member of map.
---
 atom/common/id_weak_map.cc | 42 +++++++++++++++++++-------------------
 atom/common/id_weak_map.h  | 10 ++++++++-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/atom/common/id_weak_map.cc b/atom/common/id_weak_map.cc
index 2067585eb8f5..c925f1f055c5 100644
--- a/atom/common/id_weak_map.cc
+++ b/atom/common/id_weak_map.cc
@@ -12,16 +12,9 @@ namespace atom {
 
 namespace {
 
-struct ObjectKey {
-  ObjectKey(int id, KeyWeakMap* map) : id(id), map(map) {}
-  int id;
-  KeyWeakMap* map;
-};
-
-void OnObjectGC(const v8::WeakCallbackInfo<ObjectKey>& data) {
-  ObjectKey* key = data.GetParameter();
-  key->map->Remove(key->id);
-  delete key;
+void OnObjectGC(const v8::WeakCallbackInfo<KeyWeakMap::KeyObject>& data) {
+  KeyWeakMap::KeyObject* key_object = data.GetParameter();
+  key_object->self->Remove(key_object->key);
 }
 
 }  // namespace
@@ -30,15 +23,17 @@ KeyWeakMap::KeyWeakMap() {
 }
 
 KeyWeakMap::~KeyWeakMap() {
+  for (const auto& p : map_)
+    p.second.second->ClearWeak();
 }
 
 void KeyWeakMap::Set(v8::Isolate* isolate,
-                    int32_t id,
+                    int32_t key,
                     v8::Local<v8::Object> object) {
-  auto global = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
-  ObjectKey* key = new ObjectKey(id, this);
-  global->SetWeak(key, OnObjectGC, v8::WeakCallbackType::kParameter);
-  map_[id] = global;
+  auto value = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
+  KeyObject key_object = {key, this};
+  auto& p = map_[key] = std::make_pair(key_object, value);
+  value->SetWeak(&(p.first), OnObjectGC, v8::WeakCallbackType::kParameter);
 }
 
 v8::MaybeLocal<v8::Object> KeyWeakMap::Get(v8::Isolate* isolate, int32_t id) {
@@ -46,7 +41,7 @@ v8::MaybeLocal<v8::Object> KeyWeakMap::Get(v8::Isolate* isolate, int32_t id) {
   if (iter == map_.end())
     return v8::MaybeLocal<v8::Object>();
   else
-    return v8::Local<v8::Object>::New(isolate, *iter->second);
+    return v8::Local<v8::Object>::New(isolate, *(iter->second.second));
 }
 
 bool KeyWeakMap::Has(int32_t id) const {
@@ -56,17 +51,22 @@ bool KeyWeakMap::Has(int32_t id) const {
 std::vector<v8::Local<v8::Object>> KeyWeakMap::Values(v8::Isolate* isolate) {
   std::vector<v8::Local<v8::Object>> keys;
   keys.reserve(map_.size());
-  for (const auto& iter : map_)
-    keys.emplace_back(v8::Local<v8::Object>::New(isolate, *iter.second));
+  for (const auto& iter : map_) {
+    const auto& value = *(iter.second.second);
+    keys.emplace_back(v8::Local<v8::Object>::New(isolate, value));
+  }
   return keys;
 }
 
 void KeyWeakMap::Remove(int32_t id) {
   auto iter = map_.find(id);
-  if (iter == map_.end())
+  if (iter == map_.end()) {
     LOG(WARNING) << "Removing unexist object with ID " << id;
-  else
-    map_.erase(iter);
+    return;
+  }
+
+  iter->second.second->ClearWeak();
+  map_.erase(iter);
 }
 
 IDWeakMap::IDWeakMap() : next_id_(0) {
diff --git a/atom/common/id_weak_map.h b/atom/common/id_weak_map.h
index a3c49b2346c7..f2014b1cd7fd 100644
--- a/atom/common/id_weak_map.h
+++ b/atom/common/id_weak_map.h
@@ -16,6 +16,12 @@ namespace atom {
 // Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer.
 class KeyWeakMap {
  public:
+  // Records the key and self, used by SetWeak.
+  struct KeyObject {
+    int32_t key;
+    KeyWeakMap* self;
+  };
+
   KeyWeakMap();
   virtual ~KeyWeakMap();
 
@@ -36,7 +42,9 @@ class KeyWeakMap {
 
  private:
   // Map of stored objects.
-  std::unordered_map<int32_t, linked_ptr<v8::Global<v8::Object>>> map_;
+  std::unordered_map<
+      int32_t,
+      std::pair<KeyObject, linked_ptr<v8::Global<v8::Object>>>> map_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyWeakMap);
 };

From ea93553225e4a7c36cfb1dd27d991c7db95720eb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 14:46:32 +0900
Subject: [PATCH 098/510] Make KeyWeakMap a template class

---
 atom/common/id_weak_map.cc | 63 ------------------------
 atom/common/id_weak_map.h  | 44 +----------------
 atom/common/key_weak_map.h | 98 ++++++++++++++++++++++++++++++++++++++
 filenames.gypi             |  1 +
 4 files changed, 101 insertions(+), 105 deletions(-)
 create mode 100644 atom/common/key_weak_map.h

diff --git a/atom/common/id_weak_map.cc b/atom/common/id_weak_map.cc
index c925f1f055c5..9c14c99d495b 100644
--- a/atom/common/id_weak_map.cc
+++ b/atom/common/id_weak_map.cc
@@ -4,71 +4,8 @@
 
 #include "atom/common/id_weak_map.h"
 
-#include <utility>
-
-#include "native_mate/converter.h"
-
 namespace atom {
 
-namespace {
-
-void OnObjectGC(const v8::WeakCallbackInfo<KeyWeakMap::KeyObject>& data) {
-  KeyWeakMap::KeyObject* key_object = data.GetParameter();
-  key_object->self->Remove(key_object->key);
-}
-
-}  // namespace
-
-KeyWeakMap::KeyWeakMap() {
-}
-
-KeyWeakMap::~KeyWeakMap() {
-  for (const auto& p : map_)
-    p.second.second->ClearWeak();
-}
-
-void KeyWeakMap::Set(v8::Isolate* isolate,
-                    int32_t key,
-                    v8::Local<v8::Object> object) {
-  auto value = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
-  KeyObject key_object = {key, this};
-  auto& p = map_[key] = std::make_pair(key_object, value);
-  value->SetWeak(&(p.first), OnObjectGC, v8::WeakCallbackType::kParameter);
-}
-
-v8::MaybeLocal<v8::Object> KeyWeakMap::Get(v8::Isolate* isolate, int32_t id) {
-  auto iter = map_.find(id);
-  if (iter == map_.end())
-    return v8::MaybeLocal<v8::Object>();
-  else
-    return v8::Local<v8::Object>::New(isolate, *(iter->second.second));
-}
-
-bool KeyWeakMap::Has(int32_t id) const {
-  return map_.find(id) != map_.end();
-}
-
-std::vector<v8::Local<v8::Object>> KeyWeakMap::Values(v8::Isolate* isolate) {
-  std::vector<v8::Local<v8::Object>> keys;
-  keys.reserve(map_.size());
-  for (const auto& iter : map_) {
-    const auto& value = *(iter.second.second);
-    keys.emplace_back(v8::Local<v8::Object>::New(isolate, value));
-  }
-  return keys;
-}
-
-void KeyWeakMap::Remove(int32_t id) {
-  auto iter = map_.find(id);
-  if (iter == map_.end()) {
-    LOG(WARNING) << "Removing unexist object with ID " << id;
-    return;
-  }
-
-  iter->second.second->ClearWeak();
-  map_.erase(iter);
-}
-
 IDWeakMap::IDWeakMap() : next_id_(0) {
 }
 
diff --git a/atom/common/id_weak_map.h b/atom/common/id_weak_map.h
index f2014b1cd7fd..c5cf89b074cf 100644
--- a/atom/common/id_weak_map.h
+++ b/atom/common/id_weak_map.h
@@ -5,52 +5,12 @@
 #ifndef ATOM_COMMON_ID_WEAK_MAP_H_
 #define ATOM_COMMON_ID_WEAK_MAP_H_
 
-#include <unordered_map>
-#include <vector>
-
-#include "base/memory/linked_ptr.h"
-#include "v8/include/v8.h"
+#include "atom/common/key_weak_map.h"
 
 namespace atom {
 
-// Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer.
-class KeyWeakMap {
- public:
-  // Records the key and self, used by SetWeak.
-  struct KeyObject {
-    int32_t key;
-    KeyWeakMap* self;
-  };
-
-  KeyWeakMap();
-  virtual ~KeyWeakMap();
-
-  // Sets the object to WeakMap with the given |id|.
-  void Set(v8::Isolate* isolate, int32_t id, v8::Local<v8::Object> object);
-
-  // Gets the object from WeakMap by its |id|.
-  v8::MaybeLocal<v8::Object> Get(v8::Isolate* isolate, int32_t id);
-
-  // Whethere there is an object with |id| in this WeakMap.
-  bool Has(int32_t id) const;
-
-  // Returns all objects.
-  std::vector<v8::Local<v8::Object>> Values(v8::Isolate* isolate);
-
-  // Remove object with |id| in the WeakMap.
-  void Remove(int32_t key);
-
- private:
-  // Map of stored objects.
-  std::unordered_map<
-      int32_t,
-      std::pair<KeyObject, linked_ptr<v8::Global<v8::Object>>>> map_;
-
-  DISALLOW_COPY_AND_ASSIGN(KeyWeakMap);
-};
-
 // Provides key increments service in addition to KeyWeakMap.
-class IDWeakMap : public KeyWeakMap {
+class IDWeakMap : public KeyWeakMap<int32_t> {
  public:
   IDWeakMap();
   ~IDWeakMap() override;
diff --git a/atom/common/key_weak_map.h b/atom/common/key_weak_map.h
new file mode 100644
index 000000000000..2d13c8170ad1
--- /dev/null
+++ b/atom/common/key_weak_map.h
@@ -0,0 +1,98 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_KEY_WEAK_MAP_H_
+#define ATOM_COMMON_KEY_WEAK_MAP_H_
+
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "base/memory/linked_ptr.h"
+#include "v8/include/v8.h"
+
+namespace atom {
+
+namespace internal {
+
+}  // namespace internal
+
+// Like ES6's WeakMap, but the key is Integer and the value is Weak Pointer.
+template<typename K>
+class KeyWeakMap {
+ public:
+  // Records the key and self, used by SetWeak.
+  struct KeyObject {
+    K key;
+    KeyWeakMap* self;
+  };
+
+  KeyWeakMap() {}
+  virtual ~KeyWeakMap() {
+    for (const auto& p : map_)
+      p.second.second->ClearWeak();
+  }
+
+  // Sets the object to WeakMap with the given |key|.
+  void Set(v8::Isolate* isolate, const K& key, v8::Local<v8::Object> object) {
+    auto value = make_linked_ptr(new v8::Global<v8::Object>(isolate, object));
+    KeyObject key_object = {key, this};
+    auto& p = map_[key] = std::make_pair(key_object, value);
+    value->SetWeak(&(p.first), OnObjectGC, v8::WeakCallbackType::kParameter);
+  }
+
+  // Gets the object from WeakMap by its |key|.
+  v8::MaybeLocal<v8::Object> Get(v8::Isolate* isolate, const K& key) {
+    auto iter = map_.find(key);
+    if (iter == map_.end())
+      return v8::MaybeLocal<v8::Object>();
+    else
+      return v8::Local<v8::Object>::New(isolate, *(iter->second.second));
+  }
+
+  // Whethere there is an object with |key| in this WeakMap.
+  bool Has(const K& key) const {
+    return map_.find(key) != map_.end();
+  }
+
+  // Returns all objects.
+  std::vector<v8::Local<v8::Object>> Values(v8::Isolate* isolate) {
+    std::vector<v8::Local<v8::Object>> keys;
+    keys.reserve(map_.size());
+    for (const auto& iter : map_) {
+      const auto& value = *(iter.second.second);
+      keys.emplace_back(v8::Local<v8::Object>::New(isolate, value));
+    }
+    return keys;
+  }
+
+  // Remove object with |key| in the WeakMap.
+  void Remove(const K& key) {
+    auto iter = map_.find(key);
+    if (iter == map_.end()) {
+      LOG(WARNING) << "Removing unexist object with ID " << key;
+      return;
+    }
+
+    iter->second.second->ClearWeak();
+    map_.erase(iter);
+  }
+
+ private:
+  static void OnObjectGC(
+      const v8::WeakCallbackInfo<KeyWeakMap<K>::KeyObject>& data) {
+    KeyWeakMap<K>::KeyObject* key_object = data.GetParameter();
+    key_object->self->Remove(key_object->key);
+  }
+
+  // Map of stored objects.
+  std::unordered_map<
+      K, std::pair<KeyObject, linked_ptr<v8::Global<v8::Object>>>> map_;
+
+  DISALLOW_COPY_AND_ASSIGN(KeyWeakMap);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_COMMON_KEY_WEAK_MAP_H_
diff --git a/filenames.gypi b/filenames.gypi
index e4321bccc186..49832f43a58d 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -340,6 +340,7 @@
       'atom/common/google_api_key.h',
       'atom/common/id_weak_map.cc',
       'atom/common/id_weak_map.h',
+      'atom/common/key_weak_map.h',
       'atom/common/keyboard_util.cc',
       'atom/common/keyboard_util.h',
       'atom/common/mouse_util.cc',

From c708ae8eb56eccf1f0eba1bd1dc39da1b5cd034f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 15:51:22 +0900
Subject: [PATCH 099/510] Remove IDWeakMap

---
 atom/browser/api/trackable_object.h    | 15 ++++++++----
 atom/common/api/atom_api_id_weak_map.h |  4 ++--
 atom/common/id_weak_map.cc             | 25 -------------------
 atom/common/id_weak_map.h              | 33 --------------------------
 filenames.gypi                         |  2 --
 5 files changed, 12 insertions(+), 67 deletions(-)
 delete mode 100644 atom/common/id_weak_map.cc
 delete mode 100644 atom/common/id_weak_map.h

diff --git a/atom/browser/api/trackable_object.h b/atom/browser/api/trackable_object.h
index 1c71d84e42c9..2786261d8860 100644
--- a/atom/browser/api/trackable_object.h
+++ b/atom/browser/api/trackable_object.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "atom/browser/api/event_emitter.h"
-#include "atom/common/id_weak_map.h"
+#include "atom/common/key_weak_map.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -113,21 +113,26 @@ class TrackableObject : public TrackableObjectBase,
 
   void AfterInit(v8::Isolate* isolate) override {
     if (!weak_map_) {
-      weak_map_.reset(new atom::IDWeakMap);
+      weak_map_.reset(new atom::KeyWeakMap<int32_t>);
     }
-    weak_map_id_ = weak_map_->Add(isolate, Wrappable<T>::GetWrapper());
+    weak_map_id_ = ++next_id_;
+    weak_map_->Set(isolate, weak_map_id_, Wrappable<T>::GetWrapper());
     if (wrapped_)
       AttachAsUserData(wrapped_);
   }
 
  private:
-  static scoped_ptr<atom::IDWeakMap> weak_map_;
+  static int32_t next_id_;
+  static scoped_ptr<atom::KeyWeakMap<int32_t>> weak_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TrackableObject);
 };
 
 template<typename T>
-scoped_ptr<atom::IDWeakMap> TrackableObject<T>::weak_map_;
+int32_t TrackableObject<T>::next_id_ = 0;
+
+template<typename T>
+scoped_ptr<atom::KeyWeakMap<int32_t>> TrackableObject<T>::weak_map_;
 
 }  // namespace mate
 
diff --git a/atom/common/api/atom_api_id_weak_map.h b/atom/common/api/atom_api_id_weak_map.h
index 0151c7cea479..16012b4e20de 100644
--- a/atom/common/api/atom_api_id_weak_map.h
+++ b/atom/common/api/atom_api_id_weak_map.h
@@ -5,7 +5,7 @@
 #ifndef ATOM_COMMON_API_ATOM_API_ID_WEAK_MAP_H_
 #define ATOM_COMMON_API_ATOM_API_ID_WEAK_MAP_H_
 
-#include "atom/common/id_weak_map.h"
+#include "atom/common/key_weak_map.h"
 #include "native_mate/object_template_builder.h"
 #include "native_mate/handle.h"
 
@@ -31,7 +31,7 @@ class IDWeakMap : public mate::Wrappable<IDWeakMap> {
   bool Has(int32_t id);
   void Remove(int32_t id);
 
-  atom::IDWeakMap id_weak_map_;
+  atom::KeyWeakMap<int32_t> id_weak_map_;
 
   DISALLOW_COPY_AND_ASSIGN(IDWeakMap);
 };
diff --git a/atom/common/id_weak_map.cc b/atom/common/id_weak_map.cc
deleted file mode 100644
index 9c14c99d495b..000000000000
--- a/atom/common/id_weak_map.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/id_weak_map.h"
-
-namespace atom {
-
-IDWeakMap::IDWeakMap() : next_id_(0) {
-}
-
-IDWeakMap::~IDWeakMap() {
-}
-
-int32_t IDWeakMap::Add(v8::Isolate* isolate, v8::Local<v8::Object> object) {
-  int32_t id = GetNextID();
-  Set(isolate, id, object);
-  return id;
-}
-
-int32_t IDWeakMap::GetNextID() {
-  return ++next_id_;
-}
-
-}  // namespace atom
diff --git a/atom/common/id_weak_map.h b/atom/common/id_weak_map.h
deleted file mode 100644
index c5cf89b074cf..000000000000
--- a/atom/common/id_weak_map.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_ID_WEAK_MAP_H_
-#define ATOM_COMMON_ID_WEAK_MAP_H_
-
-#include "atom/common/key_weak_map.h"
-
-namespace atom {
-
-// Provides key increments service in addition to KeyWeakMap.
-class IDWeakMap : public KeyWeakMap<int32_t> {
- public:
-  IDWeakMap();
-  ~IDWeakMap() override;
-
-  // Adds |object| to WeakMap and returns its allocated |id|.
-  int32_t Add(v8::Isolate* isolate, v8::Local<v8::Object> object);
-
- private:
-  // Returns next available ID.
-  int32_t GetNextID();
-
-  // ID of next stored object.
-  int32_t next_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(IDWeakMap);
-};
-
-}  // namespace atom
-
-#endif  // ATOM_COMMON_ID_WEAK_MAP_H_
diff --git a/filenames.gypi b/filenames.gypi
index 49832f43a58d..fa1b1d770a32 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -338,8 +338,6 @@
       'atom/common/draggable_region.cc',
       'atom/common/draggable_region.h',
       'atom/common/google_api_key.h',
-      'atom/common/id_weak_map.cc',
-      'atom/common/id_weak_map.h',
       'atom/common/key_weak_map.h',
       'atom/common/keyboard_util.cc',
       'atom/common/keyboard_util.h',

From 04d59991b0b6a1fe65e023aa4146844e87cc7052 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 16:15:32 +0900
Subject: [PATCH 100/510] Use create function instead of IDWeakMap constructor

---
 atom/common/api/atom_api_id_weak_map.cc | 14 +++++---------
 atom/common/api/atom_api_id_weak_map.h  |  2 +-
 lib/browser/rpc-server.js               |  9 +++++----
 lib/renderer/api/remote.js              |  7 +++----
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/atom/common/api/atom_api_id_weak_map.cc b/atom/common/api/atom_api_id_weak_map.cc
index 1669f25373c9..93457943fce5 100644
--- a/atom/common/api/atom_api_id_weak_map.cc
+++ b/atom/common/api/atom_api_id_weak_map.cc
@@ -5,7 +5,6 @@
 #include "atom/common/api/atom_api_id_weak_map.h"
 
 #include "atom/common/node_includes.h"
-#include "native_mate/constructor.h"
 #include "native_mate/dictionary.h"
 
 namespace atom {
@@ -13,6 +12,7 @@ namespace atom {
 namespace api {
 
 IDWeakMap::IDWeakMap(v8::Isolate* isolate) {
+  Init(isolate);
 }
 
 IDWeakMap::~IDWeakMap() {
@@ -47,8 +47,8 @@ void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
 }
 
 // static
-mate::WrappableBase* IDWeakMap::Create(v8::Isolate* isolate) {
-  return new IDWeakMap(isolate);
+mate::Handle<IDWeakMap> IDWeakMap::Create(v8::Isolate* isolate) {
+  return mate::CreateHandle(isolate, new IDWeakMap(isolate));
 }
 
 }  // namespace api
@@ -61,12 +61,8 @@ using atom::api::IDWeakMap;
 
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
-  v8::Isolate* isolate = context->GetIsolate();
-  v8::Local<v8::Function> constructor = mate::CreateConstructor<IDWeakMap>(
-      isolate, "IDWeakMap", base::Bind(&IDWeakMap::Create));
-  mate::Dictionary id_weak_map(isolate, constructor);
-  mate::Dictionary dict(isolate, exports);
-  dict.Set("IDWeakMap", id_weak_map);
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("createIDWeakMap", &atom::api::IDWeakMap::Create);
 }
 
 }  // namespace
diff --git a/atom/common/api/atom_api_id_weak_map.h b/atom/common/api/atom_api_id_weak_map.h
index 16012b4e20de..6d5a8bf7f430 100644
--- a/atom/common/api/atom_api_id_weak_map.h
+++ b/atom/common/api/atom_api_id_weak_map.h
@@ -15,7 +15,7 @@ namespace api {
 
 class IDWeakMap : public mate::Wrappable<IDWeakMap> {
  public:
-  static mate::WrappableBase* Create(v8::Isolate* isolate);
+  static mate::Handle<IDWeakMap> Create(v8::Isolate* isolate);
 
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::ObjectTemplate> prototype);
diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index 1dff5fdb8ade..00b0e9f468ee 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -1,10 +1,11 @@
 'use strict'
 
 const electron = require('electron')
-const ipcMain = electron.ipcMain
-const objectsRegistry = require('./objects-registry')
 const v8Util = process.atomBinding('v8_util')
-const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap
+const {ipcMain} = electron
+const {createIDWeakMap} = process.atomBinding('id_weak_map')
+
+const objectsRegistry = require('./objects-registry')
 
 // The internal properties of Function.
 const FUNCTION_PROPERTIES = [
@@ -13,7 +14,7 @@ const FUNCTION_PROPERTIES = [
 
 // The remote functions in renderer processes.
 // id => Function
-let rendererFunctions = new IDWeakMap()
+let rendererFunctions = createIDWeakMap()
 
 // Merge two IDs together.
 let mergeIds = function (webContentsId, metaId) {
diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index 6631ea22575a..ae3011c5eb1b 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -1,15 +1,14 @@
 'use strict'
 
-const ipcRenderer = require('electron').ipcRenderer
-const CallbacksRegistry = require('electron').CallbacksRegistry
 const v8Util = process.atomBinding('v8_util')
-const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap
+const {ipcRenderer, CallbacksRegistry} = require('electron')
+const {createIDWeakMap} = process.atomBinding('id_weak_map')
 
 const callbacksRegistry = new CallbacksRegistry()
 
 var includes = [].includes
 
-var remoteObjectCache = new IDWeakMap()
+var remoteObjectCache = createIDWeakMap()
 
 // Check for circular reference.
 var isCircular = function (field, visited) {

From 9200e32b0ef4e55f9fcfcb5a0256f789c5421be6 Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Wed, 11 May 2016 10:26:15 +0200
Subject: [PATCH 101/510] :memo: Document Dialog Buttons Behavior on Windows

Closes #5464
---
 docs/api/dialog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/dialog.md b/docs/api/dialog.md
index 0ba41df96adf..1444b5960e81 100644
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -88,7 +88,7 @@ will be passed via `callback(filename)`
   * `type` String - Can be `"none"`, `"info"`, `"error"`, `"question"` or
   `"warning"`. On Windows, "question" displays the same icon as "info", unless
   you set an icon using the "icon" option.
-  * `buttons` Array - Array of texts for buttons.
+  * `buttons` Array - Array of texts for buttons. On Windows, an empty array will result in one button labeled "OK".
   * `defaultId` Integer - Index of the button in the buttons array which will
     be selected by default when the message box opens.
   * `title` String - Title of the message box, some platforms will not show it.

From ffa5abe99bbf19163f3e75a1937ac7a23f95551d Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Wed, 11 May 2016 10:48:33 +0200
Subject: [PATCH 102/510] :memo: Add Windows Store Guide

This commit adds a guide about how to compile your app as a Windows Store app, analog to the Mac App Store guide.
---
 docs/README.md                       |  1 +
 docs/tutorial/windows-store-guide.md | 92 ++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 docs/tutorial/windows-store-guide.md

diff --git a/docs/README.md b/docs/README.md
index 997499329b6c..b925fedcbba8 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -20,6 +20,7 @@ an issue:
 * [Security](tutorial/security.md)
 * [Application Distribution](tutorial/application-distribution.md)
 * [Mac App Store Submission Guide](tutorial/mac-app-store-submission-guide.md)
+* [Windows Store Guide](tutorial/windows-store-guide.md)
 * [Application Packaging](tutorial/application-packaging.md)
 * [Using Native Node Modules](tutorial/using-native-node-modules.md)
 * [Debugging Main Process](tutorial/debugging-main-process.md)
diff --git a/docs/tutorial/windows-store-guide.md b/docs/tutorial/windows-store-guide.md
new file mode 100644
index 000000000000..c3ab6e22ed42
--- /dev/null
+++ b/docs/tutorial/windows-store-guide.md
@@ -0,0 +1,92 @@
+# Windows Store Guide
+
+With Windows 8, the good old win32 exectuable got a new sibling: The Universial Windows Platform. The new `.appx` format does not only enable a number of new powerful APIs like Cortana or Push Notifications, but through the Windows Store, also simplifies installation and updating.
+
+Microsoft [developed a tool that compiles Electron apps as `.appx` packages](http://github.com/catalystcode/electron-windows-store), enabling developers to use some of the goodies found in the new application model. This guide explains how to use it - and what the capabilities and limitations of an Electron AppX package are.
+
+## Background and Requirements
+
+Windows 10 "Anniversary Update" is able to run win32 `.exe` binaries by launching them together with a virtualized filesystem and registry. Both are created during compilation by running app and installer inside a Windows Container, allowing Windows to identify exactly which modifications to the operating system are done during installation. Pairing the executable with a virtual filesystem and a virtual registry allows Windows to enable one-click installation and uninstallation.
+
+In addition, the exe is launched inside the appx model - meaning that it can use many of the APIs available to the Universial Windows Platform. To gain even more capabilities, an Electron app can pair up with an invisible UWP app launched together with the `exe` - sort of launched as a sidekick to run tasks in the background, receive push notifications, or to communicate with other UWP applications.
+
+To compile any existing Electron app, ensure that you have the following requirements:
+
+ * Windows 10 Anniversary Update - Enterprise Edition (This is build 14316 and up - as of May 2016, it's part of the Windows Insiders Preview)
+ * A machine with 64 bit (x64) processor, Hardware-Assisted Virtualization, and Second Level Address Translation (SLAT)
+ * The Windows 10 SDK, [downloadable here](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
+ * At least Node 4 (to check, run `node -v`)
+ 
+Then, go and install the `electron-windows-store` CLI:
+
+```
+npm install -g electron-windows-store
+```
+
+## Setup and Preparation
+
+Before running the CLI for the first time, you will have to setup the "Windows Desktop App Converter". This will take a few minutes, but don't worry - you only have to do this once. Download and Desktop App Converter from [here](https://www.microsoft.com/en-us/download/details.aspx?id=51691). You will receive two files: `DesktopAppConverter.zip` and `BaseImage-14316.wim`.
+
+1. Unzip `DesktopAppConverter.zip`. From an elevated PowerShell (opened with "run as Administrator", ensure that your systems execution policy allows us to run everything we intend to run by calling `Set-ExecutionPolicy bypass`.
+2. Then, run the installation of the Desktop App Converter, passing in the location of the Windows base Image (downloaded as `BaseImage-14316.wim`), by calling `.\DesktopAppConverter.ps1 -Setup -BaseImage .\BaseImage-14316.wim`.
+3. If running the above command prompts you for a reboot, please restart your machine and run the above command again after a successful restart.
+
+Once installation succeeded, you can move on to compiling your Electron app.
+
+## Package Your Electron Application
+
+Package the application using [electron-packager](https://github.com/electron-userland/electron-packager) (or a similar tool). Make sure to remove `node_modules` that you don't need in your final application, since any module you don't actually need will just increase your application's size.
+
+The output should look roughly like this:
+
+```
+├── Ghost.exe
+├── LICENSE
+├── content_resources_200_percent.pak
+├── content_shell.pak
+├── d3dcompiler_47.dll
+├── ffmpeg.dll
+├── icudtl.dat
+├── libEGL.dll
+├── libGLESv2.dll
+├── locales
+│   ├── am.pak
+│   ├── ar.pak
+│   ├── [...]
+├── msvcp120.dll
+├── msvcr120.dll
+├── natives_blob.bin
+├── node.dll
+├── pdf.dll
+├── resources
+│   ├── app
+│   └── atom.asar
+├── snapshot_blob.bin
+├── squirrel.exe
+├── ui_resources_200_percent.pak
+├── vccorlib120.dll
+└── xinput1_3.dll
+```
+
+## Running the Command Line Tool
+
+From an elevated PowerShell (run it "as Administrator"), run `electron-windows-store` with the required parameters, passing both the input and output directories, the app's name and version, and confirmation that `node_modules` should be flattened.
+
+```
+electron-windows-store `
+    --input-directory C:\myelectronapp `
+    --output-directory C:\output\myelectronapp `
+    --flatten true `
+    --package-version 1.0.0.0 `
+    --package-name myelectronapp
+```
+
+Once executed, the tool goes to work: It accepts your Electron app as an input, flattening the `node_modules`. Then, it archives your application as `app.zip`. Using an installer and a Windows Container, the tool creates an "expanded" AppX package - including the Windows Application Manifest (`AppXManifest.xml`) as well as the virtual file system and the virtual registry inside your output folder.
+
+Once the expanded AppX files are created, the tool uses the Windows App Packager (`MakeAppx.exe`) to create a single-file AppX package from those files on disk. Finally, the tool can be used to create a trusted certificate on your computer to sign the new AppX pacakge. With the signed AppX package, the CLI can also automatically install the package on your machine.
+
+## Using the AppX Package
+
+Since the Windows Anniversary Update (codenamed Windows Redstone) has not been released to consumers yet, you won't be able to release your app to the Windows Store until later this year - but you can already use the `Add-AppxPackage` [PowerShell Cmdlet to install it on machines](https://technet.microsoft.com/en-us/library/hh856048.aspx) in developer or enterprise environments.
+
+Another important limitation is that the compiled AppX package still contains a win32 executable - and will therefore not run on Xbox, HoloLens, or Phones.

From a077355d70a6d1a7b5c3b5b7465618ece924bf56 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 18:21:35 +0900
Subject: [PATCH 103/510] Turn api::IDWeakMap into api::KeyWeakMap<T>

---
 atom/common/api/atom_api_id_weak_map.cc  | 70 ------------------------
 atom/common/api/atom_api_id_weak_map.h   | 43 ---------------
 atom/common/api/atom_api_key_weak_map.cc | 21 +++++++
 atom/common/api/atom_api_key_weak_map.h  | 65 ++++++++++++++++++++++
 filenames.gypi                           |  4 +-
 5 files changed, 88 insertions(+), 115 deletions(-)
 delete mode 100644 atom/common/api/atom_api_id_weak_map.cc
 delete mode 100644 atom/common/api/atom_api_id_weak_map.h
 create mode 100644 atom/common/api/atom_api_key_weak_map.cc
 create mode 100644 atom/common/api/atom_api_key_weak_map.h

diff --git a/atom/common/api/atom_api_id_weak_map.cc b/atom/common/api/atom_api_id_weak_map.cc
deleted file mode 100644
index 93457943fce5..000000000000
--- a/atom/common/api/atom_api_id_weak_map.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/api/atom_api_id_weak_map.h"
-
-#include "atom/common/node_includes.h"
-#include "native_mate/dictionary.h"
-
-namespace atom {
-
-namespace api {
-
-IDWeakMap::IDWeakMap(v8::Isolate* isolate) {
-  Init(isolate);
-}
-
-IDWeakMap::~IDWeakMap() {
-}
-
-void IDWeakMap::Set(v8::Isolate* isolate,
-                    int32_t id,
-                    v8::Local<v8::Object> object) {
-  id_weak_map_.Set(isolate, id, object);
-}
-
-v8::Local<v8::Object> IDWeakMap::Get(v8::Isolate* isolate, int32_t id) {
-  return id_weak_map_.Get(isolate, id).ToLocalChecked();
-}
-
-bool IDWeakMap::Has(int32_t id) {
-  return id_weak_map_.Has(id);
-}
-
-void IDWeakMap::Remove(int32_t id) {
-  id_weak_map_.Remove(id);
-}
-
-// static
-void IDWeakMap::BuildPrototype(v8::Isolate* isolate,
-                               v8::Local<v8::ObjectTemplate> prototype) {
-  mate::ObjectTemplateBuilder(isolate, prototype)
-      .SetMethod("set", &IDWeakMap::Set)
-      .SetMethod("get", &IDWeakMap::Get)
-      .SetMethod("has", &IDWeakMap::Has)
-      .SetMethod("remove", &IDWeakMap::Remove);
-}
-
-// static
-mate::Handle<IDWeakMap> IDWeakMap::Create(v8::Isolate* isolate) {
-  return mate::CreateHandle(isolate, new IDWeakMap(isolate));
-}
-
-}  // namespace api
-
-}  // namespace atom
-
-namespace {
-
-using atom::api::IDWeakMap;
-
-void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context, void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("createIDWeakMap", &atom::api::IDWeakMap::Create);
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_id_weak_map, Initialize)
diff --git a/atom/common/api/atom_api_id_weak_map.h b/atom/common/api/atom_api_id_weak_map.h
deleted file mode 100644
index 6d5a8bf7f430..000000000000
--- a/atom/common/api/atom_api_id_weak_map.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_COMMON_API_ATOM_API_ID_WEAK_MAP_H_
-#define ATOM_COMMON_API_ATOM_API_ID_WEAK_MAP_H_
-
-#include "atom/common/key_weak_map.h"
-#include "native_mate/object_template_builder.h"
-#include "native_mate/handle.h"
-
-namespace atom {
-
-namespace api {
-
-class IDWeakMap : public mate::Wrappable<IDWeakMap> {
- public:
-  static mate::Handle<IDWeakMap> Create(v8::Isolate* isolate);
-
-  static void BuildPrototype(v8::Isolate* isolate,
-                             v8::Local<v8::ObjectTemplate> prototype);
-
- protected:
-  explicit IDWeakMap(v8::Isolate* isolate);
-  ~IDWeakMap();
-
- private:
-  // Api for IDWeakMap.
-  void Set(v8::Isolate* isolate, int32_t id, v8::Local<v8::Object> object);
-  v8::Local<v8::Object> Get(v8::Isolate* isolate, int32_t id);
-  bool Has(int32_t id);
-  void Remove(int32_t id);
-
-  atom::KeyWeakMap<int32_t> id_weak_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(IDWeakMap);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_COMMON_API_ATOM_API_ID_WEAK_MAP_H_
diff --git a/atom/common/api/atom_api_key_weak_map.cc b/atom/common/api/atom_api_key_weak_map.cc
new file mode 100644
index 000000000000..be703c2b15d2
--- /dev/null
+++ b/atom/common/api/atom_api_key_weak_map.cc
@@ -0,0 +1,21 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/common/api/atom_api_key_weak_map.h"
+
+#include "atom/common/node_includes.h"
+#include "native_mate/dictionary.h"
+
+namespace {
+
+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context, void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("createIDWeakMap",
+                 &atom::api::KeyWeakMap<int32_t>::Create);
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_id_weak_map, Initialize)
diff --git a/atom/common/api/atom_api_key_weak_map.h b/atom/common/api/atom_api_key_weak_map.h
new file mode 100644
index 000000000000..b13338badd5b
--- /dev/null
+++ b/atom/common/api/atom_api_key_weak_map.h
@@ -0,0 +1,65 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
+#define ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
+
+#include "atom/common/key_weak_map.h"
+#include "native_mate/object_template_builder.h"
+#include "native_mate/handle.h"
+
+namespace atom {
+
+namespace api {
+
+template<typename K>
+class KeyWeakMap : public mate::Wrappable<KeyWeakMap<K>> {
+ public:
+  static mate::Handle<KeyWeakMap<K>> Create(v8::Isolate* isolate) {
+    return mate::CreateHandle(isolate, new KeyWeakMap<K>(isolate));
+  }
+
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Local<v8::ObjectTemplate> prototype) {
+    mate::ObjectTemplateBuilder(isolate, prototype)
+        .SetMethod("set", &KeyWeakMap<K>::Set)
+        .SetMethod("get", &KeyWeakMap<K>::Get)
+        .SetMethod("has", &KeyWeakMap<K>::Has)
+        .SetMethod("remove", &KeyWeakMap<K>::Remove);
+  }
+
+ protected:
+  explicit KeyWeakMap(v8::Isolate* isolate) {
+    mate::Wrappable<KeyWeakMap<K>>::Init(isolate);
+  }
+  ~KeyWeakMap() override {}
+
+ private:
+  // API for KeyWeakMap.
+  void Set(v8::Isolate* isolate, const K& key, v8::Local<v8::Object> object) {
+    key_weak_map_.Set(isolate, key, object);
+  }
+
+  v8::Local<v8::Object> Get(v8::Isolate* isolate, const K& key) {
+    return key_weak_map_.Get(isolate, key).ToLocalChecked();
+  }
+
+  bool Has(const K& key) {
+    return key_weak_map_.Has(key);
+  }
+
+  void Remove(const K& key) {
+    key_weak_map_.Remove(key);
+  }
+
+  atom::KeyWeakMap<K> key_weak_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(KeyWeakMap);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
diff --git a/filenames.gypi b/filenames.gypi
index fa1b1d770a32..e85f150615a3 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -288,8 +288,8 @@
       'atom/common/api/atom_api_asar.cc',
       'atom/common/api/atom_api_clipboard.cc',
       'atom/common/api/atom_api_crash_reporter.cc',
-      'atom/common/api/atom_api_id_weak_map.cc',
-      'atom/common/api/atom_api_id_weak_map.h',
+      'atom/common/api/atom_api_key_weak_map.cc',
+      'atom/common/api/atom_api_key_weak_map.h',
       'atom/common/api/atom_api_native_image.cc',
       'atom/common/api/atom_api_native_image.h',
       'atom/common/api/atom_api_native_image_mac.mm',

From 49ac160ff78da795133187eff30f4cb787b202c1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 19:30:06 +0900
Subject: [PATCH 104/510] Move createIDWeakMap to v8Util

---
 atom/common/api/atom_api_key_weak_map.cc | 21 ---------------------
 atom/common/api/atom_api_v8_util.cc      |  2 ++
 atom/common/node_bindings.cc             |  1 -
 filenames.gypi                           |  1 -
 lib/browser/rpc-server.js                |  3 +--
 lib/renderer/api/remote.js               |  3 +--
 6 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 atom/common/api/atom_api_key_weak_map.cc

diff --git a/atom/common/api/atom_api_key_weak_map.cc b/atom/common/api/atom_api_key_weak_map.cc
deleted file mode 100644
index be703c2b15d2..000000000000
--- a/atom/common/api/atom_api_key_weak_map.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/api/atom_api_key_weak_map.h"
-
-#include "atom/common/node_includes.h"
-#include "native_mate/dictionary.h"
-
-namespace {
-
-void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context, void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("createIDWeakMap",
-                 &atom::api::KeyWeakMap<int32_t>::Create);
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_id_weak_map, Initialize)
diff --git a/atom/common/api/atom_api_v8_util.cc b/atom/common/api/atom_api_v8_util.cc
index 109f9f0f36c2..dcaa2ee5a748 100644
--- a/atom/common/api/atom_api_v8_util.cc
+++ b/atom/common/api/atom_api_v8_util.cc
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "atom/common/api/atom_api_key_weak_map.h"
 #include "atom/common/api/remote_callback_freer.h"
 #include "atom/common/api/remote_object_freer.h"
 #include "atom/common/native_mate_converters/content_converter.h"
@@ -67,6 +68,7 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
+  dict.SetMethod("createIDWeakMap", &atom::api::KeyWeakMap<int32_t>::Create);
 }
 
 }  // namespace
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index 31105886eb7c..b3c36fdd8e03 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -52,7 +52,6 @@ REFERENCE_MODULE(atom_browser_window);
 REFERENCE_MODULE(atom_common_asar);
 REFERENCE_MODULE(atom_common_clipboard);
 REFERENCE_MODULE(atom_common_crash_reporter);
-REFERENCE_MODULE(atom_common_id_weak_map);
 REFERENCE_MODULE(atom_common_native_image);
 REFERENCE_MODULE(atom_common_screen);
 REFERENCE_MODULE(atom_common_shell);
diff --git a/filenames.gypi b/filenames.gypi
index e85f150615a3..f9bbe8f75f1b 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -288,7 +288,6 @@
       'atom/common/api/atom_api_asar.cc',
       'atom/common/api/atom_api_clipboard.cc',
       'atom/common/api/atom_api_crash_reporter.cc',
-      'atom/common/api/atom_api_key_weak_map.cc',
       'atom/common/api/atom_api_key_weak_map.h',
       'atom/common/api/atom_api_native_image.cc',
       'atom/common/api/atom_api_native_image.h',
diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index 00b0e9f468ee..afb505018715 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -3,7 +3,6 @@
 const electron = require('electron')
 const v8Util = process.atomBinding('v8_util')
 const {ipcMain} = electron
-const {createIDWeakMap} = process.atomBinding('id_weak_map')
 
 const objectsRegistry = require('./objects-registry')
 
@@ -14,7 +13,7 @@ const FUNCTION_PROPERTIES = [
 
 // The remote functions in renderer processes.
 // id => Function
-let rendererFunctions = createIDWeakMap()
+let rendererFunctions = v8Util.createIDWeakMap()
 
 // Merge two IDs together.
 let mergeIds = function (webContentsId, metaId) {
diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index ae3011c5eb1b..01d777e8526f 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -2,13 +2,12 @@
 
 const v8Util = process.atomBinding('v8_util')
 const {ipcRenderer, CallbacksRegistry} = require('electron')
-const {createIDWeakMap} = process.atomBinding('id_weak_map')
 
 const callbacksRegistry = new CallbacksRegistry()
 
 var includes = [].includes
 
-var remoteObjectCache = createIDWeakMap()
+var remoteObjectCache = v8Util.createIDWeakMap()
 
 // Check for circular reference.
 var isCircular = function (field, visited) {

From 1b2b7fc4ce717ebe1c6482de328eec69d76eb924 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 11 May 2016 12:48:46 +0200
Subject: [PATCH 105/510] Listen for devtools-opened on webContents

---
 lib/browser/chrome-extension.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 562e77a11509..d9e973de6bec 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -136,7 +136,7 @@ app.once('ready', function () {
   init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)
-    return this.on('devtools-opened', function () {
+    return this.webContents.on('devtools-opened', function () {
       return this._loadDevToolsExtensions(Object.keys(extensionInfoMap).map(function (key) {
         return extensionInfoMap[key]
       }))

From a32f50ef6465333fb6de55ccca4a19718c4e6d79 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 11 May 2016 12:54:52 +0200
Subject: [PATCH 106/510] Use arrow function for this binding

---
 lib/browser/chrome-extension.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index d9e973de6bec..2056a9b89973 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -136,7 +136,7 @@ app.once('ready', function () {
   init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)
-    return this.webContents.on('devtools-opened', function () {
+    return this.webContents.on('devtools-opened', () => {
       return this._loadDevToolsExtensions(Object.keys(extensionInfoMap).map(function (key) {
         return extensionInfoMap[key]
       }))

From 6578c4f0b3249c7908ea2b68cfa25a0f3eae69a3 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 20:10:38 +0900
Subject: [PATCH 107/510] Bump v1.0.1

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 2 +-
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 32d218fa768c..03e5fd950fa2 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.0.0</string>
+  <string>1.0.1</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
+  <string>1.0.1</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 6163c1ffce6b..dbf1214cb591 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION 1,0,1,0
+ PRODUCTVERSION 1,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.0.0"
+            VALUE "FileVersion", "1.0.1"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.0.0"
+            VALUE "ProductVersion", "1.0.1"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 561341cfaeab..b614ecb2c9bd 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 0
+#define ATOM_PATCH_VERSION 1
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index 651fc9119e5f..777b65532e72 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.0.0',
+    'version%': '1.0.1',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index fba4b8befe21..2503b139efa7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From 759a46f3d61c029cbfdcc96904fa1450ea8bb410 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 20:40:48 +0900
Subject: [PATCH 108/510] Use DoubleIDWeakMap for |rendererFunctions|

---
 atom/common/api/atom_api_v8_util.cc | 51 +++++++++++++++++++++++++++++
 atom/common/key_weak_map.h          |  4 +--
 lib/browser/rpc-server.js           | 15 ++-------
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/atom/common/api/atom_api_v8_util.cc b/atom/common/api/atom_api_v8_util.cc
index dcaa2ee5a748..e9e755a9e490 100644
--- a/atom/common/api/atom_api_v8_util.cc
+++ b/atom/common/api/atom_api_v8_util.cc
@@ -3,15 +3,64 @@
 // found in the LICENSE file.
 
 #include <string>
+#include <utility>
 
 #include "atom/common/api/atom_api_key_weak_map.h"
 #include "atom/common/api/remote_callback_freer.h"
 #include "atom/common/api/remote_object_freer.h"
 #include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/node_includes.h"
+#include "base/hash.h"
 #include "native_mate/dictionary.h"
 #include "v8/include/v8-profiler.h"
 
+namespace base {
+
+// Following code should be removed after we upgraded to Chrome 50.
+template <typename T1, typename T2>
+inline size_t HashInts(T1 value1, T2 value2) {
+  // This condition is expected to be compile-time evaluated and optimised away
+  // in release builds.
+  if (sizeof(T1) > sizeof(uint32_t) || (sizeof(T2) > sizeof(uint32_t)))
+    return HashInts64(value1, value2);
+
+  return HashInts32(value1, value2);
+}
+
+}  // namespace base
+
+namespace std {
+
+// The hash function used by DoubleIDWeakMap.
+template <typename Type1, typename Type2>
+struct hash<std::pair<Type1, Type2>> {
+  std::size_t operator()(std::pair<Type1, Type2> value) const {
+    return base::HashInts<Type1, Type2>(value.first, value.second);
+  }
+};
+
+}  // namespace std
+
+namespace mate {
+
+template<typename Type1, typename Type2>
+struct Converter<std::pair<Type1, Type2>> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Local<v8::Value> val,
+                     std::pair<Type1, Type2>* out) {
+    if (!val->IsArray())
+      return false;
+
+    v8::Local<v8::Array> array(v8::Local<v8::Array>::Cast(val));
+    if (array->Length() != 2)
+      return false;
+    return Converter<Type1>::FromV8(isolate, array->Get(0), &out->first) &&
+           Converter<Type2>::FromV8(isolate, array->Get(1), &out->second);
+  }
+};
+
+}  // namespace mate
+
 namespace {
 
 v8::Local<v8::Value> GetHiddenValue(v8::Isolate* isolate,
@@ -69,6 +118,8 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   dict.SetMethod("setRemoteCallbackFreer", &atom::RemoteCallbackFreer::BindTo);
   dict.SetMethod("setRemoteObjectFreer", &atom::RemoteObjectFreer::BindTo);
   dict.SetMethod("createIDWeakMap", &atom::api::KeyWeakMap<int32_t>::Create);
+  dict.SetMethod("createDoubleIDWeakMap",
+                 &atom::api::KeyWeakMap<std::pair<int32_t, int32_t>>::Create);
 }
 
 }  // namespace
diff --git a/atom/common/key_weak_map.h b/atom/common/key_weak_map.h
index 2d13c8170ad1..786779b14df8 100644
--- a/atom/common/key_weak_map.h
+++ b/atom/common/key_weak_map.h
@@ -70,10 +70,8 @@ class KeyWeakMap {
   // Remove object with |key| in the WeakMap.
   void Remove(const K& key) {
     auto iter = map_.find(key);
-    if (iter == map_.end()) {
-      LOG(WARNING) << "Removing unexist object with ID " << key;
+    if (iter == map_.end())
       return;
-    }
 
     iter->second.second->ClearWeak();
     map_.erase(iter);
diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index afb505018715..b4512bfacce6 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -13,18 +13,7 @@ const FUNCTION_PROPERTIES = [
 
 // The remote functions in renderer processes.
 // id => Function
-let rendererFunctions = v8Util.createIDWeakMap()
-
-// Merge two IDs together.
-let mergeIds = function (webContentsId, metaId) {
-  const PADDING_BITS = 20
-  if ((webContentsId << PADDING_BITS) < 0) {
-    throw new Error(`webContents ID is too large: ${webContentsId}`)
-  } else if (metaId > (1 << PADDING_BITS)) {
-    throw new Error(`Object ID is too large: ${metaId}`)
-  }
-  return (webContentsId << PADDING_BITS) + metaId
-}
+let rendererFunctions = v8Util.createDoubleIDWeakMap()
 
 // Return the description of object's members:
 let getObjectMembers = function (object) {
@@ -179,7 +168,7 @@ var unwrapArgs = function (sender, args) {
         // Merge webContentsId and meta.id, since meta.id can be the same in
         // different webContents.
         const webContentsId = sender.getId()
-        const objectId = mergeIds(webContentsId, meta.id)
+        const objectId = [webContentsId, meta.id]
 
         // Cache the callbacks in renderer.
         if (rendererFunctions.has(objectId)) {

From 12d40cd310858bc2ebb8b663aa74ba3b03333102 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 20:57:21 +0900
Subject: [PATCH 109/510] Add typename hint to fix compilation error on VS2015

---
 atom/common/key_weak_map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/common/key_weak_map.h b/atom/common/key_weak_map.h
index 786779b14df8..bce34bfe0f6e 100644
--- a/atom/common/key_weak_map.h
+++ b/atom/common/key_weak_map.h
@@ -79,7 +79,7 @@ class KeyWeakMap {
 
  private:
   static void OnObjectGC(
-      const v8::WeakCallbackInfo<KeyWeakMap<K>::KeyObject>& data) {
+      const v8::WeakCallbackInfo<typename KeyWeakMap<K>::KeyObject>& data) {
     KeyWeakMap<K>::KeyObject* key_object = data.GetParameter();
     key_object->self->Remove(key_object->key);
   }

From ff3104b44b7166e44651fd35d4d8655524ae2c4c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 21:20:40 +0900
Subject: [PATCH 110/510] hash function for pair is already defined in VS

---
 atom/common/api/atom_api_v8_util.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/atom/common/api/atom_api_v8_util.cc b/atom/common/api/atom_api_v8_util.cc
index e9e755a9e490..79c00d221289 100644
--- a/atom/common/api/atom_api_v8_util.cc
+++ b/atom/common/api/atom_api_v8_util.cc
@@ -14,9 +14,10 @@
 #include "native_mate/dictionary.h"
 #include "v8/include/v8-profiler.h"
 
+// Following code should be removed after we upgraded to Chrome 50.
+#if !defined(COMPILER_MSVC)
 namespace base {
 
-// Following code should be removed after we upgraded to Chrome 50.
 template <typename T1, typename T2>
 inline size_t HashInts(T1 value1, T2 value2) {
   // This condition is expected to be compile-time evaluated and optimised away
@@ -40,6 +41,7 @@ struct hash<std::pair<Type1, Type2>> {
 };
 
 }  // namespace std
+#endif  // defined(COMPILER_MSVC)
 
 namespace mate {
 

From 64718888dd1c6b29d09d1ed13f86c14d61b5353e Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Wed, 11 May 2016 22:30:10 +0530
Subject: [PATCH 111/510] dialog: resize icon on linux before showing

---
 atom/browser/ui/message_box_gtk.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/atom/browser/ui/message_box_gtk.cc b/atom/browser/ui/message_box_gtk.cc
index 9615e958b275..6d0bff3fb2dc 100644
--- a/atom/browser/ui/message_box_gtk.cc
+++ b/atom/browser/ui/message_box_gtk.cc
@@ -53,9 +53,16 @@ class GtkMessageBox {
     // Set dialog's icon.
     if (!icon.isNull()) {
       GdkPixbuf* pixbuf = libgtk2ui::GdkPixbufFromSkBitmap(*icon.bitmap());
-      GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
+      GtkIconSource* iconsource = gtk_icon_source_new();
+      GtkIconSet* iconset = gtk_icon_set_new();
+      gtk_icon_source_set_pixbuf(iconsource, pixbuf);
+      gtk_icon_set_add_source(iconset, iconsource);
+      GtkWidget* image = gtk_image_new_from_icon_set(iconset,
+                                                     GTK_ICON_SIZE_DIALOG);
       gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(dialog_), image);
       gtk_widget_show(image);
+      gtk_icon_source_free(iconsource);
+      gtk_icon_set_unref(iconset);
       g_object_unref(pixbuf);
     }
 

From c29b844a97de85913c09abcf51de60d87cf0ba01 Mon Sep 17 00:00:00 2001
From: Anthony Ryan <anthonyryan1@gmail.com>
Date: Wed, 11 May 2016 15:33:43 -0400
Subject: [PATCH 112/510] Replace gtk_widget_hide_all with gtk_widget_hide

gtk_widget_hide_all was deprecated in gtk+ 2.24 and was removed
entirely in recent versions. This is a pretty straight forward
replacement.
---
 atom/browser/ui/file_dialog_gtk.cc | 2 +-
 atom/browser/ui/message_box_gtk.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc
index 6d19a2eda464..d4dfcdd1fd05 100644
--- a/atom/browser/ui/file_dialog_gtk.cc
+++ b/atom/browser/ui/file_dialog_gtk.cc
@@ -151,7 +151,7 @@ class FileChooserDialog {
 };
 
 void FileChooserDialog::OnFileDialogResponse(GtkWidget* widget, int response) {
-  gtk_widget_hide_all(dialog_);
+  gtk_widget_hide(dialog_);
 
   if (!save_callback_.is_null()) {
     if (response == GTK_RESPONSE_ACCEPT)
diff --git a/atom/browser/ui/message_box_gtk.cc b/atom/browser/ui/message_box_gtk.cc
index 9615e958b275..7056b77d012b 100644
--- a/atom/browser/ui/message_box_gtk.cc
+++ b/atom/browser/ui/message_box_gtk.cc
@@ -149,7 +149,7 @@ class GtkMessageBox {
 };
 
 void GtkMessageBox::OnResponseDialog(GtkWidget* widget, int response) {
-  gtk_widget_hide_all(dialog_);
+  gtk_widget_hide(dialog_);
 
   if (response < 0)
     callback_.Run(cancel_id_);

From 2d19d8108b07a37735beaea7fb29d879ece7b322 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@gmail.com>
Date: Thu, 12 May 2016 08:14:17 +1000
Subject: [PATCH 113/510] Fixed typo

---
 atom/browser/native_window.cc | 2 +-
 docs/api/browser-window.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 2379bdd053c5..f9008b898bd6 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -412,7 +412,7 @@ void NativeWindow::RendererUnresponsive(content::WebContents* source) {
   // responsive event soon. This could happen after the whole application had
   // blocked for a while.
   // Also notice that when closing this event would be ignored because we have
-  // explicity started a close timeout counter. This is on purpose because we
+  // explicitly started a close timeout counter. This is on purpose because we
   // don't want the unresponsive event to be sent too early when user is closing
   // the window.
   ScheduleUnresponsiveEvent(50);
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 143c0179428b..93785878d146 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -57,7 +57,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `alwaysOnTop` Boolean - Whether the window should always stay on top of
     other windows. Default is `false`.
   * `fullscreen` Boolean - Whether the window should show in fullscreen. When
-    explicity set to `false` the fullscreen button will be hidden or disabled
+    explicitly set to `false` the fullscreen button will be hidden or disabled
     on OS X. Default is `false`.
   * `fullscreenable` Boolean - Whether the maximize/zoom button on OS X should
     toggle full screen mode or maximize window. Default is `true`.

From b81742f3351a232f81e97491df8c9021f4c3c636 Mon Sep 17 00:00:00 2001
From: ecmadao <wlec@outlook.com>
Date: Thu, 12 May 2016 09:21:10 +0800
Subject: [PATCH 114/510] Update screen.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bugfix-修改错别字
---
 docs-translations/zh-CN/api/screen.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-translations/zh-CN/api/screen.md b/docs-translations/zh-CN/api/screen.md
index 3919ebabb779..6c44acfeb196 100644
--- a/docs-translations/zh-CN/api/screen.md
+++ b/docs-translations/zh-CN/api/screen.md
@@ -7,7 +7,7 @@
 **注意:** 在渲染进程 / 开发者工具栏, `window.screen` 是一个预设值的 DOM
 属性, 所以这样写 `var screen = require('electron').screen` 将不会工作.
 在我们下面的例子, 我们取代使用可变名字的 `electronScreen`.
-一个例子，创建一个充满真个屏幕的窗口 :
+一个例子，创建一个充满整个屏幕的窗口 :
 
 ```javascript
 const electron = require('electron');

From eef9d9beaf539787347f474d204b87688e70fdfb Mon Sep 17 00:00:00 2001
From: Daniel LaBarge <daniel@bexarcreative.com>
Date: Wed, 11 May 2016 21:08:01 -0500
Subject: [PATCH 115/510] Fixed grammar issue.

---
 docs/api/power-save-blocker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/power-save-blocker.md b/docs/api/power-save-blocker.md
index a44e126b4f10..f9e350867a3e 100644
--- a/docs/api/power-save-blocker.md
+++ b/docs/api/power-save-blocker.md
@@ -29,7 +29,7 @@ The `powerSaveBlocker` module has the following methods:
 Starts preventing the system from entering lower-power mode. Returns an integer
 identifying the power save blocker.
 
-**Note:** `prevent-display-sleep` has higher has precedence over
+**Note:** `prevent-display-sleep` has higher precedence over
 `prevent-app-suspension`. Only the highest precedence type takes effect. In
 other words, `prevent-display-sleep` always takes precedence over
 `prevent-app-suspension`.

From 01dcee6449e562e7b87fef4e699eecd94688c946 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 12 May 2016 18:01:03 +0900
Subject: [PATCH 116/510] Update brightray for #5503

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index a370461f3420..c0942cbbe671 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit a370461f3420ec285838126da7e7efd6a3101640
+Subproject commit c0942cbbe67158c68ecfd9bf4cb7bdea84e0d529

From b9b6e8aa68e152104496c4fde7a79b0c4a871882 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Sun, 8 May 2016 11:21:11 -0700
Subject: [PATCH 117/510] Add to security checklist

---
 docs/tutorial/security.md | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index d36f43414cc4..947948720371 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -1,19 +1,20 @@
 # Security, Native Capabilities, and Your Responsibility
 
 As web developers, we usually enjoy the strong security net of the browser - the
-risks associated with the code we write is relatively small. We rely on the
-fairly limited amount of power and capabilities granted to a website – and trust
-that our users enjoy a browser built by a large team of engineers that is able
-to quickly respond to newly discovered security threats.
+risks associated with the code we write are relatively small.  Our websites are
+granted limited powers in a sandbox, and we trust that our users enjoy a browser
+built by a large team of engineers that is able to quickly respond to newly
+discovered security threats.
 
-When working with Electron, it is important to understand that Electron isnot a
-web browser. It allows you to build powerful desktop apps with web technologies.
-Its core feature is the ability to build software is just as powerful as
-completely native applications, eclipsing the limited feature set of a website.
-The inherent risks scale with the additional powers granted to your code.
+When working with Electron, it is important to understand that Electron is not
+a web browser. It allows you to build feature-rich desktop applications with
+familiar web technologies, but your code wields much greater power. JavaScript
+can access to the filesystem, the user shell, and more. This allows you to build
+high quality native applications, but the inherent security risks scale with the
+additional powers granted to your code.
 
 With that in mind, be aware that displaying arbitrary content from untrusted
-sources poses a severe security risk that Electron is not built to handle.
+sources poses a severe security risk that Electron is not intended to handle.
 In fact, the most popular Electron apps (Atom, Slack, Visual Studio Code, etc)
 display primarily local content (or trusted, secure remote content without Node
 integration) – if your application executes code from an online source, it is
@@ -43,7 +44,7 @@ the actual destination), they will be able to execute native code on the user's
 machine.
 
 > :warning: Under no circumstances should you load and execute remote code with
-enabled Node integration. Instead, use only local files (packaged together with
+Node integration enabled. Instead, use only local files (packaged together with
 your application) to execute Node code. To display remote content, use the
 `webview` tag and make sure to disable the `nodeIntegration`.
 
@@ -54,6 +55,10 @@ This is not bulletproof, but at the least, you should attempt the following:
 * Disable the Node integration in all renderers that display remote content
   (using `webPreferences`)
 * Do not disable `webSecurity`. Disabling it will disable the same-origin policy.
+* Define a [`Content-Security-Policy`](http://www.html5rocks.com/en/tutorials/security/content-security-policy/)
+, and use restrictive rules (ie: `script-src 'self'`)
+* [Override and disable `eval`](https://github.com/nylas/N1/blob/0abc5d5defcdb057120d726b271933425b75b415/static/index.js#L6)
+, which allows strings to be executed as code.
 * Do not set `allowDisplayingInsecureContent` to true.
 * Do not set `allowRunningInsecureContent` to true.
 * Do not enable `experimentalFeatures` or `experimentalCanvasFeatures` unless

From 9a72afc9636cc959f7fc6a14d50b19cfbbbe1d38 Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Thu, 12 May 2016 16:00:58 -0400
Subject: [PATCH 118/510] :memo: Document 'Tab' as a supported accelerator.

[ci skip]
---
 docs/api/accelerator.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/api/accelerator.md b/docs/api/accelerator.md
index cf28e01037a2..1710d598e3d9 100644
--- a/docs/api/accelerator.md
+++ b/docs/api/accelerator.md
@@ -41,6 +41,7 @@ The `Super` key is mapped to the `Windows` key on Windows and Linux and
 * Punctuations like `~`, `!`, `@`, `#`, `$`, etc.
 * `Plus`
 * `Space`
+* `Tab`
 * `Backspace`
 * `Delete`
 * `Insert`

From ceea7adf98e5fb0c0fc6478100814b76962b545a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 13 May 2016 09:19:46 +0900
Subject: [PATCH 119/510] Update brightray for electron/brightray#219

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index c0942cbbe671..a98267c714b2 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit c0942cbbe67158c68ecfd9bf4cb7bdea84e0d529
+Subproject commit a98267c714b2c3435c1b86e50fd40523ef428a23

From 57b0f288cbd53d3b8be5d3782c0c9c3f4773ab93 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 13 May 2016 09:21:33 +0900
Subject: [PATCH 120/510] Bump v1.0.2

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 2 +-
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 03e5fd950fa2..adc618a26aae 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.0.1</string>
+  <string>1.0.2</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.1</string>
+  <string>1.0.2</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index dbf1214cb591..2eb5b1f0a3cf 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,0
- PRODUCTVERSION 1,0,1,0
+ FILEVERSION 1,0,2,0
+ PRODUCTVERSION 1,0,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.0.1"
+            VALUE "FileVersion", "1.0.2"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.0.1"
+            VALUE "ProductVersion", "1.0.2"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index b614ecb2c9bd..86fed8086079 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 1
+#define ATOM_PATCH_VERSION 2
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index 777b65532e72..1dcc515611a2 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.0.1',
+    'version%': '1.0.2',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index 2503b139efa7..860357dab8c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From 8d4ed037a2192f4a0da2fee83c509ede01538062 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 13:02:01 -0400
Subject: [PATCH 121/510] Add referrer_schems to AddAdditionalSchemes

---
 atom/app/atom_content_client.cc | 1 +
 atom/app/atom_content_client.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index 705573abe5d2..c0d3ff656f05 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -181,6 +181,7 @@ base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
 
 void AtomContentClient::AddAdditionalSchemes(
     std::vector<url::SchemeWithType>* standard_schemes,
+    std::vector<url::SchemeWithType>* referrer_schemes,
     std::vector<std::string>* savable_schemes) {
   standard_schemes->push_back({"chrome-extension", url::SCHEME_WITHOUT_PORT});
 }
diff --git a/atom/app/atom_content_client.h b/atom/app/atom_content_client.h
index 33dbe19d990e..f31a14605723 100644
--- a/atom/app/atom_content_client.h
+++ b/atom/app/atom_content_client.h
@@ -25,6 +25,7 @@ class AtomContentClient : public brightray::ContentClient {
   base::string16 GetLocalizedString(int message_id) const override;
   void AddAdditionalSchemes(
       std::vector<url::SchemeWithType>* standard_schemes,
+      std::vector<url::SchemeWithType>* referrer_schemes,
       std::vector<std::string>* savable_schemes) override;
   void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) override;

From b78fe04f8fef70b71deea76a2bbbb79187c6ee1f Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 13:10:14 -0400
Subject: [PATCH 122/510] Remove Vorbis from CDM support

See https://codereview.chromium.org/1690353002
---
 atom/app/atom_content_client.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index c0d3ff656f05..5c4887bf89b2 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -89,7 +89,6 @@ content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,
 
   // Add the supported codecs as if they came from the component manifest.
   std::vector<std::string> codecs;
-  codecs.push_back(kCdmSupportedCodecVorbis);
   codecs.push_back(kCdmSupportedCodecVp8);
   codecs.push_back(kCdmSupportedCodecVp9);
 #if defined(USE_PROPRIETARY_CODECS)

From dc7928021d25d97de1a9ac330caca44e4c58df71 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 13:14:17 -0400
Subject: [PATCH 123/510] Widevine AAC CDM no longer avail

See chromium ./third_party /widevine/cdm/widevine_cdm_common.h
---
 atom/app/atom_content_client.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index 5c4887bf89b2..40a6e1f5268d 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -92,7 +92,6 @@ content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,
   codecs.push_back(kCdmSupportedCodecVp8);
   codecs.push_back(kCdmSupportedCodecVp9);
 #if defined(USE_PROPRIETARY_CODECS)
-  codecs.push_back(kCdmSupportedCodecAac);
   codecs.push_back(kCdmSupportedCodecAvc1);
 #endif  // defined(USE_PROPRIETARY_CODECS)
   std::string codec_string = base::JoinString(

From 93e9cf4ac1e9141c75305e62e365520e52a7a960 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 13:40:20 -0400
Subject: [PATCH 124/510] No more GetCookieMonster

---
 atom/browser/api/atom_api_cookies.cc | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc
index 994fe6977f2a..91cbc08e1ad5 100644
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -133,12 +133,11 @@ void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
   auto filtered_callback =
       base::Bind(FilterCookies, base::Passed(&filter), callback);
 
-  net::CookieMonster* monster = GetCookieStore(getter)->GetCookieMonster();
   // Empty url will match all url cookies.
   if (url.empty())
-    monster->GetAllCookiesAsync(filtered_callback);
+    GetCookieStore(getter)->GetAllCookiesAsync(filtered_callback);
   else
-    monster->GetAllCookiesForURLAsync(GURL(url), filtered_callback);
+    GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url), filtered_callback);
 }
 
 // Removes cookie with |url| and |name| in IO thread.
@@ -162,7 +161,9 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
   std::string url, name, value, domain, path;
   bool secure = false;
   bool http_only = false;
+  double creation_date;
   double expiration_date;
+  double last_access_date;
   details->GetString("url", &url);
   details->GetString("name", &name);
   details->GetString("value", &value);
@@ -171,6 +172,13 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
   details->GetBoolean("secure", &secure);
   details->GetBoolean("httpOnly", &http_only);
 
+  base::Time creation_time;
+  if (details->GetDouble("creationDate", &creation_date)) {
+    creation_time = (creation_date == 0) ?
+        base::Time::UnixEpoch() :
+        base::Time::FromDoubleT(creation_date);
+  }
+
   base::Time expiration_time;
   if (details->GetDouble("expirationDate", &expiration_date)) {
     expiration_time = (expiration_date == 0) ?
@@ -178,9 +186,17 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
         base::Time::FromDoubleT(expiration_date);
   }
 
-  GetCookieStore(getter)->GetCookieMonster()->SetCookieWithDetailsAsync(
-      GURL(url), name, value, domain, path, expiration_time, secure, http_only,
-      false, false, false, net::COOKIE_PRIORITY_DEFAULT,
+  base::Time last_access_time;
+  if (details->GetDouble("lastAccessDate", &last_access_date)) {
+    last_access_time = (last_access_date == 0) ?
+        base::Time::UnixEpoch() :
+        base::Time::FromDoubleT(last_access_date);
+  }
+
+  GetCookieStore(getter)->SetCookieWithDetailsAsync(
+      GURL(url), name, value, domain, path, creation_time,
+      expiration_time, last_access_time, secure, http_only,
+      false, false, net::COOKIE_PRIORITY_DEFAULT,
       base::Bind(OnSetCookie, callback));
 }
 

From 5fda9bc6aea1e07ae42809155839ad1a0a3623d2 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 13:59:46 -0400
Subject: [PATCH 125/510] LoadAccessTokensCallbackType ->
 LoadAccessTokensCallback

---
 atom/browser/atom_access_token_store.cc | 2 +-
 atom/browser/atom_access_token_store.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/atom_access_token_store.cc b/atom/browser/atom_access_token_store.cc
index adf2f5061cb0..d41d1262d043 100644
--- a/atom/browser/atom_access_token_store.cc
+++ b/atom/browser/atom_access_token_store.cc
@@ -32,7 +32,7 @@ AtomAccessTokenStore::~AtomAccessTokenStore() {
 }
 
 void AtomAccessTokenStore::LoadAccessTokens(
-    const LoadAccessTokensCallbackType& callback) {
+    const LoadAccessTokensCallback& callback) {
   AccessTokenSet access_token_set;
 
   // Equivelent to access_token_set[kGeolocationProviderURL].
diff --git a/atom/browser/atom_access_token_store.h b/atom/browser/atom_access_token_store.h
index f2b734a20695..54bc2cee3c29 100644
--- a/atom/browser/atom_access_token_store.h
+++ b/atom/browser/atom_access_token_store.h
@@ -18,7 +18,7 @@ class AtomAccessTokenStore : public content::AccessTokenStore {
 
   // content::AccessTokenStore:
   void LoadAccessTokens(
-      const LoadAccessTokensCallbackType& callback) override;
+      const LoadAccessTokensCallback& callback) override;
   void SaveAccessToken(const GURL& server_url,
                        const base::string16& access_token) override;
 

From 2da39d31aac4a0b7c97b6282331aaf2955e4ce68 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 14:31:29 -0400
Subject: [PATCH 126/510] Update to new pref service location in components

---
 atom/browser/api/atom_api_session.cc                          | 2 +-
 atom/browser/atom_browser_context.cc                          | 2 +-
 atom/browser/atom_download_manager_delegate.cc                | 2 +-
 atom/browser/common_web_contents_delegate.cc                  | 4 ++--
 atom/browser/native_window.cc                                 | 2 +-
 atom/browser/web_dialog_helper.cc                             | 2 +-
 .../chrome/browser/printing/print_view_manager_base.cc        | 2 +-
 .../chrome/browser/printing/print_view_manager_base.h         | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
index 39c435b723ea..58fd358ca971 100644
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -22,7 +22,7 @@
 #include "atom/common/node_includes.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
-#include "base/prefs/pref_service.h"
+#include "components/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
index b06c6278f53f..04d5134a49e9 100644
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -21,7 +21,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_registry_simple.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
diff --git a/atom/browser/atom_download_manager_delegate.cc b/atom/browser/atom_download_manager_delegate.cc
index 295747a33c4e..bf09a4059504 100644
--- a/atom/browser/atom_download_manager_delegate.cc
+++ b/atom/browser/atom_download_manager_delegate.cc
@@ -12,7 +12,7 @@
 #include "atom/browser/ui/file_dialog.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/prefs/pref_service.h"
+#include "components/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index e17bcb9b2198..da3647bc907e 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -16,8 +16,8 @@
 #include "atom/browser/web_dialog_helper.h"
 #include "atom/common/atom_constants.h"
 #include "base/files/file_util.h"
-#include "base/prefs/pref_service.h"
-#include "base/prefs/scoped_user_pref_update.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index f9008b898bd6..6986c680facf 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -17,7 +17,7 @@
 #include "atom/common/options_switches.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
-#include "base/prefs/pref_service.h"
+#include "components/prefs/pref_service.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "brightray/browser/inspectable_web_contents.h"
diff --git a/atom/browser/web_dialog_helper.cc b/atom/browser/web_dialog_helper.cc
index c3d2a1d0f23f..a082c3814c72 100644
--- a/atom/browser/web_dialog_helper.cc
+++ b/atom/browser/web_dialog_helper.cc
@@ -13,7 +13,7 @@
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
-#include "base/prefs/pref_service.h"
+#include "components/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_view_host.h"
diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc
index 688256e4251f..dbb57906e777 100644
--- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc
+++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/prefs/pref_service.h"
+#include "components/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.h b/chromium_src/chrome/browser/printing/print_view_manager_base.h
index 0d44248bfe29..78e5729a5fb1 100644
--- a/chromium_src/chrome/browser/printing/print_view_manager_base.h
+++ b/chromium_src/chrome/browser/printing/print_view_manager_base.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_
 
 #include "base/memory/ref_counted.h"
-#include "base/prefs/pref_member.h"
+#include "components/prefs/pref_member.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"

From 82f3bb26ce6c27766b6b79cd1bb764bb48824ec3 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 14:35:21 -0400
Subject: [PATCH 127/510] AccessTokenSet -> AccessTokenMap

---
 atom/browser/atom_access_token_store.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom/browser/atom_access_token_store.cc b/atom/browser/atom_access_token_store.cc
index d41d1262d043..ed87ea979920 100644
--- a/atom/browser/atom_access_token_store.cc
+++ b/atom/browser/atom_access_token_store.cc
@@ -33,17 +33,17 @@ AtomAccessTokenStore::~AtomAccessTokenStore() {
 
 void AtomAccessTokenStore::LoadAccessTokens(
     const LoadAccessTokensCallback& callback) {
-  AccessTokenSet access_token_set;
+  AccessTokenMap access_token_map;
 
-  // Equivelent to access_token_set[kGeolocationProviderURL].
+  // Equivelent to access_token_map[kGeolocationProviderURL].
   // Somehow base::string16 is causing compilation errors when used in a pair
   // of std::map on Linux, this can work around it.
   std::pair<GURL, base::string16> token_pair;
   token_pair.first = GURL(kGeolocationProviderURL);
-  access_token_set.insert(token_pair);
+  access_token_map.insert(token_pair);
 
   auto browser_context = AtomBrowserMainParts::Get()->browser_context();
-  callback.Run(access_token_set, browser_context->url_request_context_getter());
+  callback.Run(access_token_map, browser_context->url_request_context_getter());
 }
 
 void AtomAccessTokenStore::SaveAccessToken(const GURL& server_url,

From 8a2aebd03f287781e4f13623e4f5ef0b72a25926 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 14:40:02 -0400
Subject: [PATCH 128/510] PermissionStatus constant update

---
 atom/browser/atom_permission_manager.cc                | 10 +++++-----
 atom/browser/web_contents_permission_helper.cc         |  2 +-
 .../common/native_mate_converters/content_converter.cc |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc
index f7523c07ff83..144643178504 100644
--- a/atom/browser/atom_permission_manager.cc
+++ b/atom/browser/atom_permission_manager.cc
@@ -40,7 +40,7 @@ void AtomPermissionManager::SetPermissionRequestHandler(
   if (handler.is_null() && !pending_requests_.empty()) {
     for (const auto& request : pending_requests_) {
       if (!WebContentsDestroyed(request.second.render_process_id))
-        request.second.callback.Run(content::PERMISSION_STATUS_DENIED);
+        request.second.callback.Run(content::PermissionStatus::DENIED);
     }
     pending_requests_.clear();
   }
@@ -74,7 +74,7 @@ int AtomPermissionManager::RequestPermission(
     return request_id_;
   }
 
-  response_callback.Run(content::PERMISSION_STATUS_GRANTED);
+  response_callback.Run(content::PermissionStatus::GRANTED);
   return kNoPendingOperation;
 }
 
@@ -92,7 +92,7 @@ int AtomPermissionManager::RequestPermissions(
       content::ChildProcessSecurityPolicy::GetInstance()->
           GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID());
     }
-    permissionStatuses.push_back(content::PERMISSION_STATUS_GRANTED);
+    permissionStatuses.push_back(content::PermissionStatus::GRANTED);
   }
   callback.Run(permissionStatuses);
   return kNoPendingOperation;
@@ -115,7 +115,7 @@ void AtomPermissionManager::CancelPermissionRequest(int request_id) {
   auto request = pending_requests_.find(request_id);
   if (request != pending_requests_.end()) {
     if (!WebContentsDestroyed(request->second.render_process_id))
-      request->second.callback.Run(content::PERMISSION_STATUS_DENIED);
+      request->second.callback.Run(content::PermissionStatus::DENIED);
     pending_requests_.erase(request);
   }
 }
@@ -130,7 +130,7 @@ content::PermissionStatus AtomPermissionManager::GetPermissionStatus(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
-  return content::PERMISSION_STATUS_GRANTED;
+  return content::PermissionStatus::GRANTED;
 }
 
 void AtomPermissionManager::RegisterPermissionUsage(
diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc
index 7c944832d88d..088e0b52d04b 100644
--- a/atom/browser/web_contents_permission_helper.cc
+++ b/atom/browser/web_contents_permission_helper.cc
@@ -35,7 +35,7 @@ void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
 
 void OnPermissionResponse(const base::Callback<void(bool)>& callback,
                           content::PermissionStatus status) {
-  if (status == content::PERMISSION_STATUS_GRANTED)
+  if (status == content::PermissionStatus::GRANTED)
     callback.Run(true);
   else
     callback.Run(false);
diff --git a/atom/common/native_mate_converters/content_converter.cc b/atom/common/native_mate_converters/content_converter.cc
index 5589c5a84af2..b672f946cb6c 100644
--- a/atom/common/native_mate_converters/content_converter.cc
+++ b/atom/common/native_mate_converters/content_converter.cc
@@ -130,9 +130,9 @@ bool Converter<content::PermissionStatus>::FromV8(
     return false;
 
   if (result)
-    *out = content::PERMISSION_STATUS_GRANTED;
+    *out = content::PermissionStatus::GRANTED;
   else
-    *out = content::PERMISSION_STATUS_DENIED;
+    *out = content::PermissionStatus::DENIED;
 
   return true;
 }

From ff91aeb5d425c6503fcc59ea498480922b5b6804 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 14:43:50 -0400
Subject: [PATCH 129/510] Iterator to use size_t

---
 atom/browser/api/atom_api_web_contents.cc | 2 +-
 atom/browser/net/atom_network_delegate.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 7785808f3693..70110c3b5c82 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -144,7 +144,7 @@ struct Converter<net::HttpResponseHeaders*> {
                                    net::HttpResponseHeaders* headers) {
     base::DictionaryValue response_headers;
     if (headers) {
-      void* iter = nullptr;
+      size_t iter = 0;
       std::string key;
       std::string value;
       while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
diff --git a/atom/browser/net/atom_network_delegate.cc b/atom/browser/net/atom_network_delegate.cc
index 3143cd3b2575..39e0f732656b 100644
--- a/atom/browser/net/atom_network_delegate.cc
+++ b/atom/browser/net/atom_network_delegate.cc
@@ -100,7 +100,7 @@ void ToDictionary(base::DictionaryValue* details,
     return;
 
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-  void* iter = nullptr;
+  size_t iter = 0;
   std::string key;
   std::string value;
   while (headers->EnumerateHeaderLines(&iter, &key, &value)) {

From c04353a845845a882ec6c896bc5eaa49c0228f3b Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 14:45:53 -0400
Subject: [PATCH 130/510] WebFindOptions in its own header

---
 atom/browser/api/atom_api_web_contents.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 70110c3b5c82..8761482bae7d 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -63,6 +63,7 @@
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #include "atom/common/node_includes.h"

From d889bdef491adbe547dce75b66ef7039e4e18b44 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 14:20:43 -0400
Subject: [PATCH 131/510] Remove user_gesture parameter from
 PermissionManager::RequestPermission

---
 atom/browser/atom_permission_manager.cc        | 2 --
 atom/browser/atom_permission_manager.h         | 2 --
 atom/browser/web_contents_permission_helper.cc | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc
index 144643178504..a102a1cb5c9a 100644
--- a/atom/browser/atom_permission_manager.cc
+++ b/atom/browser/atom_permission_manager.cc
@@ -51,7 +51,6 @@ int AtomPermissionManager::RequestPermission(
     content::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    bool user_gesture,
     const ResponseCallback& response_callback) {
   int process_id = render_frame_host->GetProcess()->GetID();
 
@@ -82,7 +81,6 @@ int AtomPermissionManager::RequestPermissions(
     const std::vector<content::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    bool user_gesture,
     const base::Callback<void(
     const std::vector<content::PermissionStatus>&)>& callback) {
   // FIXME(zcbenz): Just ignore multiple permissions request for now.
diff --git a/atom/browser/atom_permission_manager.h b/atom/browser/atom_permission_manager.h
index e16893fd8bb5..7361e6bc0541 100644
--- a/atom/browser/atom_permission_manager.h
+++ b/atom/browser/atom_permission_manager.h
@@ -37,13 +37,11 @@ class AtomPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      bool user_gesture,
       const ResponseCallback& callback) override;
   int RequestPermissions(
       const std::vector<content::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
-      bool user_gesture,
       const base::Callback<void(
       const std::vector<content::PermissionStatus>&)>& callback) override;
 
diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc
index 088e0b52d04b..83274591e71e 100644
--- a/atom/browser/web_contents_permission_helper.cc
+++ b/atom/browser/web_contents_permission_helper.cc
@@ -60,7 +60,7 @@ void WebContentsPermissionHelper::RequestPermission(
       web_contents_->GetBrowserContext()->GetPermissionManager());
   auto origin = web_contents_->GetLastCommittedURL();
   permission_manager->RequestPermission(
-      permission, rfh, origin, user_gesture,
+      permission, rfh, origin,
       base::Bind(&OnPermissionResponse, callback));
 }
 

From f418ac5b5da8490ba447b15f6f9dc4280de49c63 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 17:09:54 -0400
Subject: [PATCH 132/510] Update to brave crashpad dep (Electron maintainer
 rebase this to use your ref)

---
 .gitmodules     | 2 +-
 vendor/crashpad | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 6164ed8b9706..13679d3dc13f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://github.com/zcbenz/native-mate.git
 [submodule "vendor/crashpad"]
 	path = vendor/crashpad
-	url = https://github.com/electron/crashpad.git
+	url = https://github.com/brave/crashpad.git
 [submodule "vendor/requests"]
 	path = vendor/requests
 	url = https://github.com/kennethreitz/requests
diff --git a/vendor/crashpad b/vendor/crashpad
index db713da7554f..8b065d74c59a 160000
--- a/vendor/crashpad
+++ b/vendor/crashpad
@@ -1 +1 @@
-Subproject commit db713da7554f565e43c6dcf9a51b59ccc4f06066
+Subproject commit 8b065d74c59a2dfacccae664a31131be976a634b

From 732936713a63e22954fd488d8fae88afb48e0915 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 13:42:10 -0400
Subject: [PATCH 133/510] GetNativeScreen -> GetScreen

---
 atom/browser/api/atom_api_menu_views.cc | 2 +-
 atom/browser/api/atom_api_screen.cc     | 2 +-
 atom/browser/native_window.cc           | 4 ++--
 atom/browser/ui/win/notify_icon.cc      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/atom/browser/api/atom_api_menu_views.cc b/atom/browser/api/atom_api_menu_views.cc
index 4d1c902e1755..9340bc76732e 100644
--- a/atom/browser/api/atom_api_menu_views.cc
+++ b/atom/browser/api/atom_api_menu_views.cc
@@ -30,7 +30,7 @@ void MenuViews::PopupAt(Window* window, int x, int y, int positioning_item) {
   // (-1, -1) means showing on mouse location.
   gfx::Point location;
   if (x == -1 || y == -1) {
-    location = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
+    location = gfx::Screen::GetScreen()->GetCursorScreenPoint();
   } else {
     gfx::Point origin = view->GetViewBounds().origin();
     location = gfx::Point(origin.x() + x, origin.y() + y);
diff --git a/atom/browser/api/atom_api_screen.cc b/atom/browser/api/atom_api_screen.cc
index 9d845e390e31..425d906e286e 100644
--- a/atom/browser/api/atom_api_screen.cc
+++ b/atom/browser/api/atom_api_screen.cc
@@ -99,7 +99,7 @@ v8::Local<v8::Value> Screen::Create(v8::Isolate* isolate) {
     return v8::Null(isolate);
   }
 
-  gfx::Screen* screen = gfx::Screen::GetNativeScreen();
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   if (!screen) {
     isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
         isolate, "Failed to get screen information")));
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 6986c680facf..a5abc56f898c 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -318,9 +318,9 @@ void NativeWindow::CapturePage(const gfx::Rect& rect,
   // current system, increase the requested bitmap size to capture it all.
   gfx::Size bitmap_size = view_size;
   const gfx::NativeView native_view = view->GetNativeView();
-  gfx::Screen* const screen = gfx::Screen::GetScreenFor(native_view);
   const float scale =
-      screen->GetDisplayNearestWindow(native_view).device_scale_factor();
+      gfx::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
+      .device_scale_factor();
   if (scale > 1.0f)
     bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
 
diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index 112473013808..464dc144ba3e 100644
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -155,7 +155,7 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
   // Show menu at mouse's position by default.
   gfx::Rect rect(pos, gfx::Size());
   if (pos.IsOrigin())
-    rect.set_origin(gfx::Screen::GetNativeScreen()->GetCursorScreenPoint());
+    rect.set_origin(gfx::Screen::GetScreen()->GetCursorScreenPoint());
 
   views::MenuRunner menu_runner(
       menu_model,

From 48e62ac0b558cb988b34c652318984e68b96fe0c Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 27 Apr 2016 17:33:51 -0400
Subject: [PATCH 134/510] Remove wwebaudio from web_preferences

Becauseit doesn't exist there anymore
---
 atom/browser/web_contents_preferences.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 41db39b56c97..bfaca8d7ca77 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -180,8 +180,6 @@ void WebContentsPreferences::OverrideWebkitPrefs(
     prefs->text_areas_are_resizable = b;
   if (self->web_preferences_.GetBoolean("webgl", &b))
     prefs->experimental_webgl_enabled = b;
-  if (self->web_preferences_.GetBoolean("webaudio", &b))
-    prefs->webaudio_enabled = b;
   if (self->web_preferences_.GetBoolean("webSecurity", &b)) {
     prefs->web_security_enabled = b;
     prefs->allow_displaying_insecure_content = !b;

From 22863b9f31db6a13a44d4ed53de71d6aafaa59e4 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Thu, 28 Apr 2016 10:02:05 -0400
Subject: [PATCH 135/510] Fix GURL coonstructor from webkit string error

---
 atom/browser/api/atom_api_cookies.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc
index 91cbc08e1ad5..22c57c97d6cf 100644
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -137,7 +137,8 @@ void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
   if (url.empty())
     GetCookieStore(getter)->GetAllCookiesAsync(filtered_callback);
   else
-    GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url), filtered_callback);
+    GetCookieStore(getter)->GetAllCookiesForURLAsync(GURL(url),
+        filtered_callback);
 }
 
 // Removes cookie with |url| and |name| in IO thread.

From 02d72c81af73bdd765beb3af9b7915209e18a747 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Thu, 28 Apr 2016 20:07:16 -0400
Subject: [PATCH 136/510] Fix linking problem with IPC::MessageT

IPC::MessageT<ChromeUtilityHostMsg_ProcessStarted_Meta, std::__1::tuple<>, void>::MessageT(IPC::Routing)
---
 atom/common/common_message_generator.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/atom/common/common_message_generator.h b/atom/common/common_message_generator.h
index 832de1abf739..64206956863e 100644
--- a/atom/common/common_message_generator.h
+++ b/atom/common/common_message_generator.h
@@ -8,3 +8,4 @@
 #include "chrome/common/print_messages.h"
 #include "chrome/common/tts_messages.h"
 #include "chrome/common/widevine_cdm_messages.h"
+#include "chrome/common/chrome_utility_messages.h"

From ce7c1023d5f80f805ed96e7f333b90c6fe07d62c Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Fri, 29 Apr 2016 09:15:04 -0400
Subject: [PATCH 137/510] Minimum fixes needed for chromium_src

---
 .../printing/printing_message_filter.cc       |  4 ----
 .../chrome/browser/process_singleton_posix.cc |  2 +-
 .../pepper_flash_clipboard_message_filter.cc  | 10 ++++----
 .../pepper/pepper_flash_drm_host.cc           |  2 +-
 .../renderer/media/chrome_key_systems.cc      |  2 +-
 .../printing/print_web_view_helper.cc         | 24 +++++++++----------
 .../renderer/printing/print_web_view_helper.h |  4 ++--
 .../printing/print_web_view_helper_mac.mm     | 12 +++-------
 .../stream_listen_socket.cc                   |  2 +-
 .../embedded_test_server/tcp_listen_socket.cc |  2 +-
 10 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.cc b/chromium_src/chrome/browser/printing/printing_message_filter.cc
index eac4405fbcf6..00efdaacd674 100644
--- a/chromium_src/chrome/browser/printing/printing_message_filter.cc
+++ b/chromium_src/chrome/browser/printing/printing_message_filter.cc
@@ -71,10 +71,6 @@ void RenderParamsFromPrintSettings(const PrintSettings& settings,
   params->margin_top = settings.page_setup_device_units().content_area().y();
   params->margin_left = settings.page_setup_device_units().content_area().x();
   params->dpi = settings.dpi();
-  // Currently hardcoded at 1.25. See PrintSettings' constructor.
-  params->min_shrink = settings.min_shrink();
-  // Currently hardcoded at 2.0. See PrintSettings' constructor.
-  params->max_shrink = settings.max_shrink();
   // Currently hardcoded at 72dpi. See PrintSettings' constructor.
   params->desired_dpi = settings.desired_dpi();
   // Always use an invalid cookie.
diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc
index 5c26d7b6157a..5742b3585205 100644
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
@@ -79,7 +79,7 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
index 9ddb9fa56d77..4e66d772ec38 100644
--- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
+++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
 
+#include <stddef.h>
+
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
@@ -48,10 +50,10 @@ ui::ClipboardType ConvertClipboardType(uint32_t type) {
 // clipboard interface for custom data.
 bool JumpToFormatInPickle(const base::string16& format,
                           base::PickleIterator* iter) {
-  size_t size = 0;
-  if (!iter->ReadSizeT(&size))
+  uint32_t size = 0;
+  if (!iter->ReadUInt32(&size))
     return false;
-  for (size_t i = 0; i < size; ++i) {
+  for (uint32_t i = 0; i < size; ++i) {
     base::string16 stored_format;
     if (!iter->ReadString16(&stored_format))
       return false;
@@ -83,7 +85,7 @@ std::string ReadDataFromPickle(const base::string16& format,
 
 bool WriteDataToPickle(const std::map<base::string16, std::string>& data,
                        base::Pickle* pickle) {
-  pickle->WriteSizeT(data.size());
+  pickle->WriteUInt32(data.size());
   for (std::map<base::string16, std::string>::const_iterator it = data.begin();
        it != data.end();
        ++it) {
diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
index f94216461769..34a7ff881f48 100644
--- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
+++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
@@ -21,7 +21,7 @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/pepper_plugin_info.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
diff --git a/chromium_src/chrome/renderer/media/chrome_key_systems.cc b/chromium_src/chrome/renderer/media/chrome_key_systems.cc
index 5d97169005b4..417a61fcdab9 100644
--- a/chromium_src/chrome/renderer/media/chrome_key_systems.cc
+++ b/chromium_src/chrome/renderer/media/chrome_key_systems.cc
@@ -124,7 +124,7 @@ static void AddPepperBasedWidevine(
   }
 
   cdm::AddWidevineWithCodecs(
-      cdm::WIDEVINE, supported_codecs,
+      supported_codecs,
 #if defined(OS_CHROMEOS)
       media::EmeRobustness::HW_SECURE_ALL,  // Maximum audio robustness.
       media::EmeRobustness::HW_SECURE_ALL,  // Maximim video robustness.
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
index eb3599198d98..39d938960cbb 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
@@ -39,6 +39,7 @@
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebPreferences;
@@ -62,9 +63,9 @@ int GetDPI(const PrintMsg_Print_Params* print_params) {
 bool PrintMsg_Print_Params_IsValid(const PrintMsg_Print_Params& params) {
   return !params.content_size.IsEmpty() && !params.page_size.IsEmpty() &&
          !params.printable_area.IsEmpty() && params.document_cookie &&
-         params.desired_dpi && params.max_shrink && params.min_shrink &&
-         params.dpi && (params.margin_top >= 0) && (params.margin_left >= 0) &&
-         params.dpi > kMinDpi && params.document_cookie != 0;
+         params.desired_dpi && params.dpi && params.margin_top >= 0 &&
+         params.margin_left >= 0 && params.dpi > kMinDpi &&
+         params.document_cookie != 0;
 }
 
 PrintMsg_Print_Params GetCssPrintParams(
@@ -425,8 +426,9 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
       blink::WebLocalFrame* parent,
       blink::WebTreeScopeType scope,
       const blink::WebString& name,
-      blink::WebSandboxFlags sandboxFlags,
-      const blink::WebFrameOwnerProperties& frameOwnerProperties) override;
+      const blink::WebString& unique_name,
+      blink::WebSandboxFlags sandbox_flags,
+      const blink::WebFrameOwnerProperties& frame_owner_properties) override;
   void frameDetached(blink::WebFrame* frame, DetachType type) override;
 
  private:
@@ -491,6 +493,7 @@ void PrepareFrameAndViewForPrint::ResizeForPrinting() {
   // think the page is 125% larger so the size of the page is correct for
   // minimum (default) scaling.
   // This is important for sites that try to fill the page.
+  // The 1.25 value is |printingMinimumShrinkFactor|.
   gfx::Size print_layout_size(web_print_params_.printContentArea.width,
                               web_print_params_.printContentArea.height);
   print_layout_size.set_height(
@@ -573,8 +576,9 @@ blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame(
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& name,
-    blink::WebSandboxFlags sandboxFlags,
-    const blink::WebFrameOwnerProperties& frameOwnerProperties) {
+    const blink::WebString& unique_name,
+    blink::WebSandboxFlags sandbox_flags,
+    const blink::WebFrameOwnerProperties& frame_owner_properties) {
   blink::WebFrame* frame = blink::WebLocalFrame::create(scope, this);
   parent->appendChild(frame);
   return frame;
@@ -1263,11 +1267,7 @@ bool PrintWebViewHelper::PrintPreviewContext::CreatePreviewDocument(
   }
 
   metafile_.reset(new PdfMetafileSkia);
-  if (!metafile_->Init()) {
-    set_error(PREVIEW_ERROR_METAFILE_INIT_FAILED);
-    LOG(ERROR) << "PdfMetafileSkia Init failed";
-    return false;
-  }
+  CHECK(metafile_->Init());
 
   current_page_index_ = 0;
   pages_to_render_ = pages;
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.h b/chromium_src/chrome/renderer/printing/print_web_view_helper.h
index 05f145b5bb87..8407777b4a0c 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.h
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.h
@@ -83,9 +83,9 @@ class PrintWebViewHelper
     PREVIEW_ERROR_NONE,  // Always first.
     PREVIEW_ERROR_BAD_SETTING,
     PREVIEW_ERROR_METAFILE_COPY_FAILED,
-    PREVIEW_ERROR_METAFILE_INIT_FAILED,
+    PREVIEW_ERROR_METAFILE_INIT_FAILED_DEPRECATED,
     PREVIEW_ERROR_ZERO_PAGES,
-    PREVIEW_ERROR_MAC_DRAFT_METAFILE_INIT_FAILED,
+    PREVIEW_ERROR_MAC_DRAFT_METAFILE_INIT_FAILED_DEPRECATED,
     PREVIEW_ERROR_PAGE_RENDERED_WITHOUT_METAFILE,
     PREVIEW_ERROR_INVALID_PRINTER_SETTINGS,
     PREVIEW_ERROR_LAST_ENUM  // Always last.
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm b/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
index b10ba616a1f6..903fbd68733a 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
@@ -12,9 +12,9 @@
 #include "chrome/common/print_messages.h"
 #include "printing/metafile_skia_wrapper.h"
 #include "printing/page_size_margins.h"
-#include "skia/ext/platform_device.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace printing {
 
@@ -24,8 +24,7 @@ void PrintWebViewHelper::PrintPageInternal(
     const PrintMsg_PrintPage_Params& params,
     WebFrame* frame) {
   PdfMetafileSkia metafile;
-  if (!metafile.Init())
-    return;
+  CHECK(metafile.Init());
 
   int page_number = params.page_number;
   gfx::Size page_size_in_dpi;
@@ -63,12 +62,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
 
   if (render_to_draft) {
     draft_metafile.reset(new PdfMetafileSkia());
-    if (!draft_metafile->Init()) {
-      print_preview_context_.set_error(
-          PREVIEW_ERROR_MAC_DRAFT_METAFILE_INIT_FAILED);
-      LOG(ERROR) << "Draft PdfMetafileSkia Init failed";
-      return false;
-    }
+    CHECK(draft_metafile->Init());
     initial_render_metafile = draft_metafile.get();
   }
 
diff --git a/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc b/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc
index 6495b23b8409..2514c636cbee 100644
--- a/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc
+++ b/chromium_src/net/test/embedded_test_server/stream_listen_socket.cc
@@ -27,7 +27,7 @@
 #include "build/build_config.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
 #include "net/base/sockaddr_storage.h"
 #include "net/socket/socket_descriptor.h"
 
diff --git a/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc b/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
index 1a72b2efe370..8e1f1177adaf 100644
--- a/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
+++ b/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
@@ -22,7 +22,7 @@
 #include "base/sys_byteorder.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
 #include "net/base/winsock_init.h"
 #include "net/socket/socket_descriptor.h"
 

From 0253aec0cd7e732d322c8993594256e11be1067c Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Fri, 29 Apr 2016 15:50:40 -0400
Subject: [PATCH 138/510] Add SkUserConfig.h with blank SkDebugf macro

This file was copied from:
./third_party/skia/include/config/SkUserConfig.h

But because of this linking error we needed to
define a macro for SkDebugf.

```
"SkDebugf(char const*, ...)", referenced from:
      SkBitmap::allocPixels(SkImageInfo const&, unsigned long) in
      libbrave_lib.a(brave_lib.native_desktop_media_list.o)
      ld: symbol(s) not found for architecture x86_64
```

There used to be a hack to copy this file here which was removed:
https://github.com/brave/libchromiumcontent/commit/8de9d9e2bcf455ba70e8005016150ab55690cb59
---
 chromium_src/SkUserConfig.h | 158 ++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 chromium_src/SkUserConfig.h

diff --git a/chromium_src/SkUserConfig.h b/chromium_src/SkUserConfig.h
new file mode 100644
index 000000000000..755b050de6c0
--- /dev/null
+++ b/chromium_src/SkUserConfig.h
@@ -0,0 +1,158 @@
+
+/*
+ * Copyright 2006 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef SkUserConfig_DEFINED
+#define SkUserConfig_DEFINED
+
+/*  SkTypes.h, the root of the public header files, does the following trick:
+
+    #include "SkPreConfig.h"
+    #include "SkUserConfig.h"
+    #include "SkPostConfig.h"
+
+    SkPreConfig.h runs first, and it is responsible for initializing certain
+    skia defines.
+
+    SkPostConfig.h runs last, and its job is to just check that the final
+    defines are consistent (i.e. that we don't have mutually conflicting
+    defines).
+
+    SkUserConfig.h (this file) runs in the middle. It gets to change or augment
+    the list of flags initially set in preconfig, and then postconfig checks
+    that everything still makes sense.
+
+    Below are optional defines that add, subtract, or change default behavior
+    in Skia. Your port can locally edit this file to enable/disable flags as
+    you choose, or these can be delared on your command line (i.e. -Dfoo).
+
+    By default, this include file will always default to having all of the flags
+    commented out, so including it will have no effect.
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+
+/*  Skia has lots of debug-only code. Often this is just null checks or other
+    parameter checking, but sometimes it can be quite intrusive (e.g. check that
+    each 32bit pixel is in premultiplied form). This code can be very useful
+    during development, but will slow things down in a shipping product.
+
+    By default, these mutually exclusive flags are defined in SkPreConfig.h,
+    based on the presence or absence of NDEBUG, but that decision can be changed
+    here.
+ */
+//#define SK_DEBUG
+//#define SK_RELEASE
+
+/*  Skia has certain debug-only code that is extremely intensive even for debug
+    builds.  This code is useful for diagnosing specific issues, but is not
+    generally applicable, therefore it must be explicitly enabled to avoid
+    the performance impact. By default these flags are undefined, but can be
+    enabled by uncommenting them below.
+ */
+//#define SK_DEBUG_GLYPH_CACHE
+//#define SK_DEBUG_PATH
+
+/*  If, in debugging mode, Skia needs to stop (presumably to invoke a debugger)
+    it will call SK_CRASH(). If this is not defined it, it is defined in
+    SkPostConfig.h to write to an illegal address
+ */
+//#define SK_CRASH() *(int *)(uintptr_t)0 = 0
+
+
+/*  preconfig will have attempted to determine the endianness of the system,
+    but you can change these mutually exclusive flags here.
+ */
+//#define SK_CPU_BENDIAN
+//#define SK_CPU_LENDIAN
+
+/*  Most compilers use the same bit endianness for bit flags in a byte as the
+    system byte endianness, and this is the default. If for some reason this
+    needs to be overridden, specify which of the mutually exclusive flags to
+    use. For example, some atom processors in certain configurations have big
+    endian byte order but little endian bit orders.
+*/
+//#define SK_UINT8_BITFIELD_BENDIAN
+//#define SK_UINT8_BITFIELD_LENDIAN
+
+
+/*  To write debug messages to a console, skia will call SkDebugf(...) following
+    printf conventions (e.g. const char* format, ...). If you want to redirect
+    this to something other than printf, define yours here
+ */
+// Log the file and line number for assertions.
+#define SkDebugf(...)
+
+/*
+ *  To specify a different default font cache limit, define this. If this is
+ *  undefined, skia will use a built-in value.
+ */
+//#define SK_DEFAULT_FONT_CACHE_LIMIT   (1024 * 1024)
+
+/*
+ *  To specify the default size of the image cache, undefine this and set it to
+ *  the desired value (in bytes). SkGraphics.h as a runtime API to set this
+ *  value as well. If this is undefined, a built-in value will be used.
+ */
+//#define SK_DEFAULT_IMAGE_CACHE_LIMIT (1024 * 1024)
+
+/*  Define this to allow PDF scalars above 32k.  The PDF/A spec doesn't allow
+    them, but modern PDF interpreters should handle them just fine.
+ */
+//#define SK_ALLOW_LARGE_PDF_SCALARS
+
+/*  Define this to provide font subsetter in PDF generation.
+ */
+//#define SK_SFNTLY_SUBSETTER "sfntly/subsetter/font_subsetter.h"
+
+/*  Define this to set the upper limit for text to support LCD. Values that
+    are very large increase the cost in the font cache and draw slower, without
+    improving readability. If this is undefined, Skia will use its default
+    value (e.g. 48)
+ */
+//#define SK_MAX_SIZE_FOR_LCDTEXT     48
+
+/*  If SK_DEBUG is defined, then you can optionally define SK_SUPPORT_UNITTEST
+    which will run additional self-tests at startup. These can take a long time,
+    so this flag is optional.
+ */
+#ifdef SK_DEBUG
+//#define SK_SUPPORT_UNITTEST
+#endif
+
+/*  Change the ordering to work in X windows.
+ */
+#ifdef SK_SAMPLES_FOR_X
+        #define SK_R32_SHIFT    16
+        #define SK_G32_SHIFT    8
+        #define SK_B32_SHIFT    0
+        #define SK_A32_SHIFT    24
+#endif
+
+
+/* Determines whether to build code that supports the GPU backend. Some classes
+   that are not GPU-specific, such as SkShader subclasses, have optional code
+   that is used allows them to interact with the GPU backend. If you'd like to
+   omit this code set SK_SUPPORT_GPU to 0. This also allows you to omit the gpu
+   directories from your include search path when you're not building the GPU
+   backend. Defaults to 1 (build the GPU code).
+ */
+//#define SK_SUPPORT_GPU 1
+
+
+/* The PDF generation code uses Path Ops to handle complex clipping paths,
+ * but at this time, Path Ops is not release ready yet. So, the code is
+ * hidden behind this #define guard. If you are feeling adventurous and
+ * want the latest and greatest PDF generation code, uncomment the #define.
+ * When Path Ops is release ready, the define guards and this user config
+ * define should be removed entirely.
+ */
+//#define SK_PDF_USE_PATHOPS_CLIPPING
+
+#endif
+

From f93fa53aea526e9eb8b4daa2837f0aef251ac63c Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Sat, 30 Apr 2016 19:56:28 -0400
Subject: [PATCH 139/510] Update linux menu overrides

---
 atom/browser/ui/views/menu_bar.cc       | 12 ++++++------
 atom/browser/ui/views/menu_bar.h        |  6 ++++--
 atom/browser/ui/views/menu_delegate.cc  |  2 +-
 atom/browser/ui/views/submenu_button.cc |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc
index ba0a542c1e8d..872375ccbbd1 100644
--- a/atom/browser/ui/views/menu_bar.cc
+++ b/atom/browser/ui/views/menu_bar.cc
@@ -104,7 +104,7 @@ int MenuBar::GetAcceleratorIndex(base::char16 key) {
 void MenuBar::ActivateAccelerator(base::char16 key) {
   int i = GetAcceleratorIndex(key);
   if (i != -1)
-    static_cast<SubmenuButton*>(child_at(i))->Activate();
+    static_cast<SubmenuButton*>(child_at(i))->Activate(nullptr);
 }
 
 int MenuBar::GetItemCount() const {
@@ -141,22 +141,22 @@ const char* MenuBar::GetClassName() const {
 void MenuBar::ButtonPressed(views::Button* sender, const ui::Event& event) {
 }
 
-void MenuBar::OnMenuButtonClicked(views::View* source,
-                                  const gfx::Point& point) {
+void MenuBar::OnMenuButtonClicked(views::MenuButton* source,
+                                  const gfx::Point& point,
+                                  const ui::Event* event) {
   // Hide the accelerator when a submenu is activated.
   SetAcceleratorVisibility(false);
 
   if (!menu_model_)
     return;
 
-  views::MenuButton* button = static_cast<views::MenuButton*>(source);
-  int id = button->tag();
+  int id = source->tag();
   ui::MenuModel::ItemType type = menu_model_->GetTypeAt(id);
   if (type != ui::MenuModel::TYPE_SUBMENU)
     return;
 
   MenuDelegate menu_delegate(this);
-  menu_delegate.RunMenu(menu_model_->GetSubmenuModelAt(id), button);
+  menu_delegate.RunMenu(menu_model_->GetSubmenuModelAt(id), source);
 }
 
 }  // namespace atom
diff --git a/atom/browser/ui/views/menu_bar.h b/atom/browser/ui/views/menu_bar.h
index 9d77cfdf2a22..9f38a5981c7f 100644
--- a/atom/browser/ui/views/menu_bar.h
+++ b/atom/browser/ui/views/menu_bar.h
@@ -57,8 +57,10 @@ class MenuBar : public views::View,
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::MenuButtonListener:
-  void OnMenuButtonClicked(views::View* source,
-                                   const gfx::Point& point) override;
+  void OnMenuButtonClicked(views::MenuButton* source,
+                           const gfx::Point& point,
+                           const ui::Event* event) override;
+
 
  private:
   SkColor background_color_;
diff --git a/atom/browser/ui/views/menu_delegate.cc b/atom/browser/ui/views/menu_delegate.cc
index f0ecf13b36b6..a107a696250b 100644
--- a/atom/browser/ui/views/menu_delegate.cc
+++ b/atom/browser/ui/views/menu_delegate.cc
@@ -112,7 +112,7 @@ views::MenuItemView* MenuDelegate::GetSiblingMenu(
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(base::IgnoreResult(&views::MenuButton::Activate),
-                   base::Unretained(button)));
+                   base::Unretained(button), nullptr));
   }
 
   return nullptr;
diff --git a/atom/browser/ui/views/submenu_button.cc b/atom/browser/ui/views/submenu_button.cc
index 72cab258cbec..ca06d7d627ef 100644
--- a/atom/browser/ui/views/submenu_button.cc
+++ b/atom/browser/ui/views/submenu_button.cc
@@ -26,7 +26,7 @@ base::string16 FilterAccelerator(const base::string16& label) {
 SubmenuButton::SubmenuButton(views::ButtonListener* listener,
                              const base::string16& title,
                              views::MenuButtonListener* menu_button_listener)
-    : views::MenuButton(listener, FilterAccelerator(title),
+    : views::MenuButton(FilterAccelerator(title),
                         menu_button_listener, false),
       accelerator_(0),
       show_underline_(false),

From 37ccd34a88607f8aea33836cbde5c175e7dbc3a7 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Sat, 30 Apr 2016 20:31:07 -0400
Subject: [PATCH 140/510]  Update x11 global shortcut listeners

---
 .../global_shortcut_listener_x11.cc           | 12 ++++++------
 .../extensions/global_shortcut_listener_x11.h | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
index 9a3cca69d538..dfd31bfb687b 100644
--- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
+++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
@@ -4,10 +4,13 @@
 
 #include "chrome/browser/extensions/global_shortcut_listener_x11.h"
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
-#include "ui/events/platform/x11/x11_event_source.h"
+#include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/gfx/x/x11_types.h"
 
@@ -35,7 +38,6 @@ int GetNativeModifiers(const ui::Accelerator& accelerator) {
   modifiers |= accelerator.IsShiftDown() ? ShiftMask : 0;
   modifiers |= accelerator.IsCtrlDown() ? ControlMask : 0;
   modifiers |= accelerator.IsAltDown() ? Mod1Mask : 0;
-  modifiers |= accelerator.IsCmdDown() ? Mod4Mask : 0;
 
   return modifiers;
 }
@@ -69,7 +71,7 @@ void GlobalShortcutListenerX11::StartListening() {
   DCHECK(!registered_hot_keys_.empty());  // Also don't start if no hotkey is
                                           // registered.
 
-  ui::X11EventSource::GetInstance()->AddPlatformEventDispatcher(this);
+  ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
 
   is_listening_ = true;
 }
@@ -79,7 +81,7 @@ void GlobalShortcutListenerX11::StopListening() {
   DCHECK(registered_hot_keys_.empty());  // Make sure the set is clean before
                                          // ending.
 
-  ui::X11EventSource::GetInstance()->RemovePlatformEventDispatcher(this);
+  ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 
   is_listening_ = false;
 }
@@ -149,8 +151,6 @@ void GlobalShortcutListenerX11::OnXKeyPressEvent(::XEvent* x_event) {
   modifiers |= (x_event->xkey.state & ShiftMask) ? ui::EF_SHIFT_DOWN : 0;
   modifiers |= (x_event->xkey.state & ControlMask) ? ui::EF_CONTROL_DOWN : 0;
   modifiers |= (x_event->xkey.state & Mod1Mask) ? ui::EF_ALT_DOWN : 0;
-  // For Windows key
-  modifiers |= (x_event->xkey.state & Mod4Mask) ? ui::EF_COMMAND_DOWN: 0;
 
   ui::Accelerator accelerator(
       ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);
diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h
index 8d551993841d..43230b7aa310 100644
--- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h
+++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h
@@ -5,9 +5,12 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_
 #define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_
 
+#include <stdint.h>
 #include <X11/Xlib.h>
+
 #include <set>
 
+#include "base/macros.h"
 #include "chrome/browser/extensions/global_shortcut_listener.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 
@@ -20,20 +23,18 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener,
                                   public ui::PlatformEventDispatcher {
  public:
   GlobalShortcutListenerX11();
-  virtual ~GlobalShortcutListenerX11();
+  ~GlobalShortcutListenerX11() override;
 
   // ui::PlatformEventDispatcher implementation.
-  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
-  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
+  bool CanDispatchEvent(const ui::PlatformEvent& event) override;
+  uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
 
  private:
   // GlobalShortcutListener implementation.
-  virtual void StartListening() override;
-  virtual void StopListening() override;
-  virtual bool RegisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) override;
-  virtual void UnregisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) override;
+  void StartListening() override;
+  void StopListening() override;
+  bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
+  void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
 
   // Invoked when a global shortcut is pressed.
   void OnXKeyPressEvent(::XEvent* x_event);

From 900001e547545c8a937da4c0950f3ebb1719dd46 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Sat, 30 Apr 2016 20:39:11 -0400
Subject: [PATCH 141/510] Update PlatformCanvas to SKCanvas

---
 .../chrome/renderer/printing/print_web_view_helper_linux.cc     | 2 +-
 .../chrome/renderer/printing/print_web_view_helper_pdf_win.cc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
index d37aec628bab..b39133931a91 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
@@ -123,7 +123,7 @@ void PrintWebViewHelper::PrintPageInternal(
                                           &content_area);
   gfx::Rect canvas_area = content_area;
 
-  skia::PlatformCanvas* canvas = metafile->GetVectorCanvasForNewPage(
+  SkCanvas* canvas = metafile->GetVectorCanvasForNewPage(
       page_size, canvas_area, scale_factor);
   if (!canvas)
     return;
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
index ce1e962505f1..ea53da443f5e 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
@@ -158,7 +158,7 @@ void PrintWebViewHelper::PrintPageInternal(
       frame->getPrintPageShrink(params.page_number);
   float scale_factor = css_scale_factor * webkit_page_shrink_factor;
 
-  skia::PlatformCanvas* canvas = metafile->GetVectorCanvasForNewPage(
+  SkCanvas* canvas = metafile->GetVectorCanvasForNewPage(
       page_size, canvas_area, scale_factor);
   if (!canvas)
     return;

From a52dbf0784ec6f6a8831ba6b9631f243dfe7bbca Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Sun, 1 May 2016 17:20:50 -0400
Subject: [PATCH 142/510] Update SharedMemory buf constructor

---
 chromium_src/chrome/browser/printing/printing_message_filter.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.cc b/chromium_src/chrome/browser/printing/printing_message_filter.cc
index 00efdaacd674..d09e05a3427b 100644
--- a/chromium_src/chrome/browser/printing/printing_message_filter.cc
+++ b/chromium_src/chrome/browser/printing/printing_message_filter.cc
@@ -140,7 +140,7 @@ void PrintingMessageFilter::OnDuplicateSection(
     base::SharedMemoryHandle* browser_handle) {
   // Duplicate the handle in this process right now so the memory is kept alive
   // (even if it is not mapped)
-  base::SharedMemory shared_buf(renderer_handle, true, PeerHandle());
+  base::SharedMemory shared_buf(renderer_handle, true);
   shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), browser_handle);
 }
 #endif

From a9652052c4a1a4f422b4d342dfd93a09802cdc2d Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 4 May 2016 13:46:37 -0400
Subject: [PATCH 143/510] Update Brightray and libchromiumcontent v50 ref
 (Electron maintainer use your refs)

---
 .gitmodules                  | 2 +-
 atom/common/chrome_version.h | 2 +-
 script/lib/config.py         | 2 +-
 vendor/brightray             | 2 +-
 vendor/crashpad              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 13679d3dc13f..a38a8d044a2e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://github.com/zcbenz/native-mate.git
 [submodule "vendor/crashpad"]
 	path = vendor/crashpad
-	url = https://github.com/brave/crashpad.git
+	url = https://github.com/crashpad/crashpad.git
 [submodule "vendor/requests"]
 	path = vendor/requests
 	url = https://github.com/kennethreitz/requests
diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h
index 8b9b7ef0c826..18abcdecabc3 100644
--- a/atom/common/chrome_version.h
+++ b/atom/common/chrome_version.h
@@ -8,7 +8,7 @@
 #ifndef ATOM_COMMON_CHROME_VERSION_H_
 #define ATOM_COMMON_CHROME_VERSION_H_
 
-#define CHROME_VERSION_STRING "49.0.2623.75"
+#define CHROME_VERSION_STRING "50.0.2661.94"
 #define CHROME_VERSION "v" CHROME_VERSION_STRING
 
 #endif  // ATOM_COMMON_CHROME_VERSION_H_
diff --git a/script/lib/config.py b/script/lib/config.py
index 4b3f4ba6fb34..a79fbed735cb 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '1a4c5e51a670633ff3ecd4448ad01ba21b440542'
+LIBCHROMIUMCONTENT_COMMIT = '5a15db93479dfaf6506d8d263d409d3f022c81b5'
 
 PLATFORM = {
   'cygwin': 'win32',
diff --git a/vendor/brightray b/vendor/brightray
index a98267c714b2..75bda7d2118c 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit a98267c714b2c3435c1b86e50fd40523ef428a23
+Subproject commit 75bda7d2118c953b35d8a7d1962067a68dea34fb
diff --git a/vendor/crashpad b/vendor/crashpad
index 8b065d74c59a..db713da7554f 160000
--- a/vendor/crashpad
+++ b/vendor/crashpad
@@ -1 +1 @@
-Subproject commit 8b065d74c59a2dfacccae664a31131be976a634b
+Subproject commit db713da7554f565e43c6dcf9a51b59ccc4f06066

From e8c4fb6903cc1fba61984b0fec62e17c62a12b42 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Wed, 4 May 2016 21:50:06 -0400
Subject: [PATCH 144/510] setBaseBackgroundColor moved to WebFrameWidget

---
 atom/renderer/atom_renderer_client.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index d090d8a10be5..9a5aa691c2f7 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -29,6 +29,7 @@
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebKit.h"
@@ -141,15 +142,19 @@ void AtomRendererClient::RenderFrameCreated(
 
 void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
+  blink::WebFrameWidget* web_frame_widget = render_view->GetWebFrameWidget();
   if (cmd->HasSwitch(switches::kGuestInstanceID)) {  // webview.
-    // Set transparent background.
-    render_view->GetWebView()->setBaseBackgroundColor(SK_ColorTRANSPARENT);
+    if (web_frame_widget) {
+      web_frame_widget->setBaseBackgroundColor(SK_ColorTRANSPARENT);
+    }
   } else {  // normal window.
     // If backgroundColor is specified then use it.
     std::string name = cmd->GetSwitchValueASCII(switches::kBackgroundColor);
     // Otherwise use white background.
     SkColor color = name.empty() ? SK_ColorWHITE : ParseHexColor(name);
-    render_view->GetWebView()->setBaseBackgroundColor(color);
+    if (web_frame_widget) {
+      web_frame_widget->setBaseBackgroundColor(color);
+    }
   }
 
   new printing::PrintWebViewHelper(render_view);

From 35d9e372200e5820c1cd3a5b6bd74510fdb76f95 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 19:37:38 +0900
Subject: [PATCH 145/510] Simplify the check for web_frame_widget

---
 atom/renderer/atom_renderer_client.cc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 9a5aa691c2f7..d04e028e20df 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -141,24 +141,23 @@ void AtomRendererClient::RenderFrameCreated(
 }
 
 void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
-  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
+  new printing::PrintWebViewHelper(render_view);
+  new AtomRenderViewObserver(render_view, this);
+
   blink::WebFrameWidget* web_frame_widget = render_view->GetWebFrameWidget();
+  if (!web_frame_widget)
+    return;
+
+  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   if (cmd->HasSwitch(switches::kGuestInstanceID)) {  // webview.
-    if (web_frame_widget) {
-      web_frame_widget->setBaseBackgroundColor(SK_ColorTRANSPARENT);
-    }
+    web_frame_widget->setBaseBackgroundColor(SK_ColorTRANSPARENT);
   } else {  // normal window.
     // If backgroundColor is specified then use it.
     std::string name = cmd->GetSwitchValueASCII(switches::kBackgroundColor);
     // Otherwise use white background.
     SkColor color = name.empty() ? SK_ColorWHITE : ParseHexColor(name);
-    if (web_frame_widget) {
-      web_frame_widget->setBaseBackgroundColor(color);
-    }
+    web_frame_widget->setBaseBackgroundColor(color);
   }
-
-  new printing::PrintWebViewHelper(render_view);
-  new AtomRenderViewObserver(render_view, this);
 }
 
 blink::WebSpeechSynthesizer* AtomRendererClient::OverrideSpeechSynthesizer(

From 9ccb495f60101d3bffc65490c7bd8d1a89bc9b1b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 19:38:27 +0900
Subject: [PATCH 146/510] Do not remove the patch for Command key

---
 .../chrome/browser/extensions/global_shortcut_listener_x11.cc   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
index dfd31bfb687b..00a689a7cb2f 100644
--- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
+++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.cc
@@ -38,6 +38,7 @@ int GetNativeModifiers(const ui::Accelerator& accelerator) {
   modifiers |= accelerator.IsShiftDown() ? ShiftMask : 0;
   modifiers |= accelerator.IsCtrlDown() ? ControlMask : 0;
   modifiers |= accelerator.IsAltDown() ? Mod1Mask : 0;
+  modifiers |= accelerator.IsCmdDown() ? Mod4Mask : 0;
 
   return modifiers;
 }
@@ -151,6 +152,7 @@ void GlobalShortcutListenerX11::OnXKeyPressEvent(::XEvent* x_event) {
   modifiers |= (x_event->xkey.state & ShiftMask) ? ui::EF_SHIFT_DOWN : 0;
   modifiers |= (x_event->xkey.state & ControlMask) ? ui::EF_CONTROL_DOWN : 0;
   modifiers |= (x_event->xkey.state & Mod1Mask) ? ui::EF_ALT_DOWN : 0;
+  modifiers |= (x_event->xkey.state & Mod4Mask) ? ui::EF_COMMAND_DOWN: 0;
 
   ui::Accelerator accelerator(
       ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);

From 525e3ee9c685d399c38204cf84d850cc96cc3eba Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 20:31:02 +0900
Subject: [PATCH 147/510] Update crashpad with AppKit patch

---
 .gitmodules     | 2 +-
 vendor/crashpad | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a38a8d044a2e..6164ed8b9706 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://github.com/zcbenz/native-mate.git
 [submodule "vendor/crashpad"]
 	path = vendor/crashpad
-	url = https://github.com/crashpad/crashpad.git
+	url = https://github.com/electron/crashpad.git
 [submodule "vendor/requests"]
 	path = vendor/requests
 	url = https://github.com/kennethreitz/requests
diff --git a/vendor/crashpad b/vendor/crashpad
index db713da7554f..e2073935d7c6 160000
--- a/vendor/crashpad
+++ b/vendor/crashpad
@@ -1 +1 @@
-Subproject commit db713da7554f565e43c6dcf9a51b59ccc4f06066
+Subproject commit e2073935d7c674f4a9e7fced821f611c5b13f07b

From 9c0f29806417498c7a715bcac76df4d306cdd0db Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2016 21:23:02 +0900
Subject: [PATCH 148/510] Update libchromiumcontent to fix renderer process
 crash

---
 script/lib/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index a79fbed735cb..610db4804c13 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '5a15db93479dfaf6506d8d263d409d3f022c81b5'
+LIBCHROMIUMCONTENT_COMMIT = 'f615ab6da33c860d526286a65dbb89b21074a784'
 
 PLATFORM = {
   'cygwin': 'win32',

From 73223fe5c35e82e1dfcf21ecf64bf77965cde900 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 11:05:42 +0900
Subject: [PATCH 149/510] Upgrade to Node v6

---
 atom/common/api/atom_api_native_image.cc  | 2 +-
 atom/common/node_includes.h               | 1 +
 atom/renderer/node_array_buffer_bridge.cc | 2 +-
 vendor/node                               | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index e440f9c518bd..97cc674a3115 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -63,7 +63,7 @@ float GetScaleFactorFromPath(const base::FilePath& path) {
 
   // We don't try to convert string to float here because it is very very
   // expensive.
-  for (unsigned i = 0; i < arraysize(kScaleFactorPairs); ++i) {
+  for (unsigned i = 0; i < node::arraysize(kScaleFactorPairs); ++i) {
     if (base::EndsWith(filename, kScaleFactorPairs[i].name,
                        base::CompareCase::INSENSITIVE_ASCII))
       return kScaleFactorPairs[i].scale;
diff --git a/atom/common/node_includes.h b/atom/common/node_includes.h
index bb76afb54db9..3734a43e5f45 100644
--- a/atom/common/node_includes.h
+++ b/atom/common/node_includes.h
@@ -21,6 +21,7 @@
 #undef CHECK_LT
 #undef DISALLOW_COPY_AND_ASSIGN
 #undef NO_RETURN
+#undef arraysize
 #undef debug_string  // This is defined in OS X 10.9 SDK in AssertMacros.h.
 #include "vendor/node/src/env.h"
 #include "vendor/node/src/env-inl.h"
diff --git a/atom/renderer/node_array_buffer_bridge.cc b/atom/renderer/node_array_buffer_bridge.cc
index c4b8d26adaa7..61ad25222f99 100644
--- a/atom/renderer/node_array_buffer_bridge.cc
+++ b/atom/renderer/node_array_buffer_bridge.cc
@@ -53,7 +53,7 @@ v8::Local<v8::Uint8Array> BlinkUint8ArrayNew(
       ab, mate::ConvertToV8(isolate, offset), mate::ConvertToV8(isolate, size)
   };
   return v8::Local<v8::Uint8Array>::Cast(constructor->NewInstance(
-      context, arraysize(args), args).ToLocalChecked());
+      context, node::arraysize(args), args).ToLocalChecked());
 }
 
 }  // namespace
diff --git a/vendor/node b/vendor/node
index 6bcd8af891a9..7d119e77b9fe 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 6bcd8af891a991f8aa196e49e6bf908ebbe24cae
+Subproject commit 7d119e77b9fe893d6e791c88c9e6122957e088ca

From 2497c73009caa3e6b37166d2175875596eab2e65 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 12:44:56 +0900
Subject: [PATCH 150/510] Import build env from VS 2015

---
 script/build.py        |  6 +++-
 script/lib/env_util.py | 71 ++++++++++++++++++++++++++++++++++++++++++
 script/lib/util.py     | 13 ++++++++
 script/update.py       |  7 +++--
 4 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 script/lib/env_util.py

diff --git a/script/build.py b/script/build.py
index c428b95f329f..a134c014254f 100755
--- a/script/build.py
+++ b/script/build.py
@@ -5,7 +5,8 @@ import os
 import subprocess
 import sys
 
-from lib.util import atom_gyp
+from lib.config import get_target_arch
+from lib.util import atom_gyp, import_vs_env
 
 
 CONFIGURATIONS = ['Release', 'Debug']
@@ -15,6 +16,9 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 def main():
   os.chdir(SOURCE_ROOT)
 
+  # Update the VS build env.
+  import_vs_env(get_target_arch())
+
   ninja = os.path.join('vendor', 'depot_tools', 'ninja')
   if sys.platform == 'win32':
     ninja += '.exe'
diff --git a/script/lib/env_util.py b/script/lib/env_util.py
new file mode 100644
index 000000000000..df759241fe80
--- /dev/null
+++ b/script/lib/env_util.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import itertools
+import subprocess
+import sys
+
+
+def validate_pair(ob):
+  if not (len(ob) == 2):
+    print("Unexpected result:", ob, file=sys.stderr)
+    return False
+  else:
+    return True
+
+
+def consume(iter):
+  try:
+    while True: next(iter)
+  except StopIteration:
+    pass
+
+
+def get_environment_from_batch_command(env_cmd, initial=None):
+  """
+  Take a command (either a single command or list of arguments)
+  and return the environment created after running that command.
+  Note that if the command must be a batch file or .cmd file, or the
+  changes to the environment will not be captured.
+
+  If initial is supplied, it is used as the initial environment passed
+  to the child process.
+  """
+  if not isinstance(env_cmd, (list, tuple)):
+    env_cmd = [env_cmd]
+  # Construct the command that will alter the environment.
+  env_cmd = subprocess.list2cmdline(env_cmd)
+  # Create a tag so we can tell in the output when the proc is done.
+  tag = 'END OF BATCH COMMAND'
+  # Construct a cmd.exe command to do accomplish this.
+  cmd = 'cmd.exe /s /c "{env_cmd} && echo "{tag}" && set"'.format(**vars())
+  # Launch the process.
+  proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=initial)
+  # Parse the output sent to stdout.
+  lines = proc.stdout
+  # Consume whatever output occurs until the tag is reached.
+  consume(itertools.takewhile(lambda l: tag not in l, lines))
+  # Define a way to handle each KEY=VALUE line.
+  handle_line = lambda l: l.rstrip().split('=',1)
+  # Parse key/values into pairs.
+  pairs = map(handle_line, lines)
+  # Make sure the pairs are valid.
+  valid_pairs = filter(validate_pair, pairs)
+  # Construct a dictionary of the pairs.
+  result = dict(valid_pairs)
+  # Let the process finish.
+  proc.communicate()
+  return result
+
+
+def get_vs_env(vs_version, arch):
+  """
+  Returns the env object for VS building environment.
+
+  The vs_version can be strings like "12.0" (e.g. VS2013), the arch has to
+  be one of "x86", "amd64", "arm", "x86_amd64", "x86_arm", "amd64_x86",
+  "amd64_arm", e.g. the args passed to vcvarsall.bat.
+  """
+  vsvarsall = "C:\\Program Files (x86)\\Microsoft Visual Studio {0}\\VC\\vcvarsall.bat".format(vs_version)
+  return get_environment_from_batch_command([vsvarsall, arch])
diff --git a/script/lib/util.py b/script/lib/util.py
index 4e5fb90988d7..c167d1d5c521 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -16,6 +16,7 @@ import os
 import zipfile
 
 from config import is_verbose_mode
+from env_util import get_vs_env
 
 
 def get_host_arch():
@@ -223,3 +224,15 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
   ] + files
 
   execute(args, env)
+
+
+def import_vs_env(target_arch):
+  if sys.platform == 'cygwin':
+    return
+
+  if target_arch == 'ia32':
+    vs_arch = 'amd64_x86'
+  else:
+    vs_arch = 'x86_amd64'
+  env = get_vs_env('14.0', vs_arch)
+  os.environ.update(env)
diff --git a/script/update.py b/script/update.py
index f820248d0aa2..a67a49e7ab51 100755
--- a/script/update.py
+++ b/script/update.py
@@ -7,7 +7,7 @@ import subprocess
 import sys
 
 from lib.config import get_target_arch, PLATFORM
-from lib.util import get_host_arch
+from lib.util import get_host_arch, import_vs_env
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -49,11 +49,14 @@ def update_gyp():
 
 
 def run_gyp(target_arch, component):
+  # Update the VS build env.
+  import_vs_env(target_arch)
+
   env = os.environ.copy()
   if PLATFORM == 'linux' and target_arch != get_host_arch():
     env['GYP_CROSSCOMPILE'] = '1'
   elif PLATFORM == 'win32':
-    env['GYP_MSVS_VERSION'] = '2013'
+    env['GYP_MSVS_VERSION'] = '2015'
   python = sys.executable
   if sys.platform == 'cygwin':
     # Force using win32 python on cygwin.

From e77582baee4abf90eb982dd528f578845bb01e41 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 13:09:41 +0900
Subject: [PATCH 151/510] Fix compilation warnings introduced by VS 2015

---
 atom/browser/native_window_views.cc             | 4 +++-
 atom/browser/ui/message_box_win.cc              | 6 ++++--
 atom/common/crash_reporter/win/crash_service.cc | 2 +-
 common.gypi                                     | 8 ++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 93e43661302e..a04a5a0eb25e 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -623,7 +623,9 @@ void NativeWindowViews::SetBackgroundColor(const std::string& color_name) {
   // Set the background color of native window.
   HBRUSH brush = CreateSolidBrush(skia::SkColorToCOLORREF(background_color));
   ULONG_PTR previous_brush = SetClassLongPtr(
-      GetAcceleratedWidget(), GCLP_HBRBACKGROUND, (LONG)brush);
+      GetAcceleratedWidget(),
+      GCLP_HBRBACKGROUND,
+      reinterpret_cast<LONG_PTR>(brush));
   if (previous_brush)
     DeleteObject((HBRUSH)previous_brush);
 #endif
diff --git a/atom/browser/ui/message_box_win.cc b/atom/browser/ui/message_box_win.cc
index 5f49151c30ff..2c4ce54856d4 100644
--- a/atom/browser/ui/message_box_win.cc
+++ b/atom/browser/ui/message_box_win.cc
@@ -64,7 +64,8 @@ void MapToCommonID(const std::vector<base::string16>& buttons,
       (*button_flags) |= common.button;
     } else {
       // It is a custom button.
-      dialog_buttons->push_back({i + kIDStart, buttons[i].c_str()});
+      dialog_buttons->push_back(
+          {static_cast<int>(i + kIDStart), buttons[i].c_str()});
     }
   }
 }
@@ -135,7 +136,8 @@ int ShowMessageBoxUTF16(HWND parent,
   std::vector<TASKDIALOG_BUTTON> dialog_buttons;
   if (options & MESSAGE_BOX_NO_LINK) {
     for (size_t i = 0; i < buttons.size(); ++i)
-      dialog_buttons.push_back({i + kIDStart, buttons[i].c_str()});
+      dialog_buttons.push_back(
+          {static_cast<int>(i + kIDStart), buttons[i].c_str()});
   } else {
     MapToCommonID(buttons, &id_map, &config.dwCommonButtons, &dialog_buttons);
   }
diff --git a/atom/common/crash_reporter/win/crash_service.cc b/atom/common/crash_reporter/win/crash_service.cc
index 58c7c38632ed..b3499bc09540 100644
--- a/atom/common/crash_reporter/win/crash_service.cc
+++ b/atom/common/crash_reporter/win/crash_service.cc
@@ -327,7 +327,7 @@ void CrashService::OnClientConnected(void* context,
 
 void CrashService::OnClientExited(void* context,
     const google_breakpad::ClientInfo* client_info) {
-  ProcessingLock lock;
+  ProcessingLock processing_lock;
   VLOG(1) << "client end. pid = " << client_info->pid();
   CrashService* self = static_cast<CrashService*>(context);
   ::InterlockedIncrement(&self->clients_terminated_);
diff --git a/common.gypi b/common.gypi
index 1088beb1b7b8..f00e4293ca42 100644
--- a/common.gypi
+++ b/common.gypi
@@ -62,7 +62,12 @@
           4232,  # address of dllimport 'free' is not static, identity not guaranteed
           4291,  # no matching operator delete found
           4295,  # array is too small to include a terminating null character
+          4311,  # 'type cast': pointer truncation from 'void *const ' to 'unsigned long'
           4389,  # '==' : signed/unsigned mismatch
+          4456,  # declaration of 'm' hides previous local declaration
+          4457,  # declaration of 'message' hides function parameter
+          4459,  # declaration of 'wq' hides global declaration
+          4477,  # format string '%.*s' requires an argument of type 'int'
           4505,  # unreferenced local function has been removed
           4701,  # potentially uninitialized local variable 'sizew' used
           4703,  # potentially uninitialized local pointer variable 'req' used
@@ -234,9 +239,12 @@
       4189,  # local variable is initialized but not referenced
       4201,  # (uv.h) nameless struct/union
       4267,  # conversion from 'size_t' to 'int', possible loss of data
+      4302,  # (atldlgs.h) 'type cast': truncation from 'LPCTSTR' to 'WORD'
+      4458,  # (atldlgs.h) declaration of 'dwCommonButtons' hides class member
       4503,  # decorated name length exceeded, name was truncated
       4800,  # (v8.h) forcing value to bool 'true' or 'false'
       4819,  # The file contains a character that cannot be represented in the current code page
+      4838,  # (atlgdi.h) conversion from 'int' to 'UINT' requires a narrowing conversion
       4996,  # (atlapp.h) 'GetVersionExW': was declared deprecated
     ],
   },

From 3aaff23f78e5682383a034b297c65a6e42f4341c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 14:00:13 +0900
Subject: [PATCH 152/510] Do not call import_vs_env for non-win32

---
 script/lib/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lib/util.py b/script/lib/util.py
index c167d1d5c521..718962769dd8 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -227,7 +227,7 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
 
 
 def import_vs_env(target_arch):
-  if sys.platform == 'cygwin':
+  if sys.platform != 'win32':
     return
 
   if target_arch == 'ia32':

From 0ad03d9ff782541caa7a9a28488e99e2cbeef6e7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 14:45:44 +0900
Subject: [PATCH 153/510] Suppress crashReporter test on x64 Windows for now

---
 spec/api-crash-reporter-spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
index b4f63fe1ef27..f262f6fc834a 100644
--- a/spec/api-crash-reporter-spec.js
+++ b/spec/api-crash-reporter-spec.js
@@ -23,6 +23,11 @@ describe('crash-reporter module', function () {
     w.destroy()
   })
 
+  // It is not working on 64bit Windows.
+  if (process.platform === 'win32' && process.arch === 'x64') {
+    return
+  }
+
   if (process.mas) {
     return
   }

From 906ae043f94ff4292f5dfd941900ef93355ad9b9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 15:18:11 +0900
Subject: [PATCH 154/510] Fix crash when creating external buffer

---
 vendor/node | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/node b/vendor/node
index 7d119e77b9fe..454e37c47804 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 7d119e77b9fe893d6e791c88c9e6122957e088ca
+Subproject commit 454e37c47804706c5524d3639f18de02f5ad18c9

From bb5b30b8a0bff93c099cb27481df15b26067a84f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 15:43:25 +0900
Subject: [PATCH 155/510] It is not allowed to run scripts in
 DidCreateDocumentElement

---
 atom/renderer/atom_render_view_observer.cc | 4 ----
 atom/renderer/atom_renderer_client.cc      | 8 ++++++++
 atom/renderer/atom_renderer_client.h       | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc
index 96dffbd512a6..bbaea351378b 100644
--- a/atom/renderer/atom_render_view_observer.cc
+++ b/atom/renderer/atom_render_view_observer.cc
@@ -27,7 +27,6 @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebKit.h"
-#include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "native_mate/dictionary.h"
@@ -89,9 +88,6 @@ void AtomRenderViewObserver::DidCreateDocumentElement(
     blink::WebLocalFrame* frame) {
   document_created_ = true;
 
-  // Make sure every page will get a script context created.
-  frame->executeScript(blink::WebScriptSource("void 0"));
-
   // Read --zoom-factor from command line.
   std::string zoom_factor_str = base::CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kZoomFactor);
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index d04e028e20df..bb5b81ba4199 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -33,6 +33,7 @@
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebKit.h"
+#include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ -160,6 +161,13 @@ void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
   }
 }
 
+void AtomRendererClient::RunScriptsAtDocumentStart(
+    content::RenderFrame* render_frame) {
+  // Make sure every page will get a script context created.
+  render_frame->GetWebFrame()->executeScript(
+      blink::WebScriptSource("void 0"));
+}
+
 blink::WebSpeechSynthesizer* AtomRendererClient::OverrideSpeechSynthesizer(
     blink::WebSpeechSynthesizerClient* client) {
   return new TtsDispatcher(client);
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 59b407ba1efb..6e962bc4c04e 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -40,6 +40,7 @@ class AtomRendererClient : public content::ContentRendererClient,
   void RenderThreadStarted() override;
   void RenderFrameCreated(content::RenderFrame*) override;
   void RenderViewCreated(content::RenderView*) override;
+  void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
   blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
       blink::WebSpeechSynthesizerClient* client) override;
   bool OverrideCreatePlugin(content::RenderFrame* render_frame,

From 4a409b870e7bbf4fc792b7497123d35ab8dee9ac Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 17:45:36 +0900
Subject: [PATCH 156/510] chromedriver's version is now v2.21

---
 script/lib/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index 610db4804c13..567701a057ab 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -45,7 +45,7 @@ def get_target_arch():
 
 
 def get_chromedriver_version():
-  return 'v2.15'
+  return 'v2.21'
 
 
 def s3_config():

From 8dc8f8f485292d24a318f02136b265fbcaa9d94d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 20:08:47 +0900
Subject: [PATCH 157/510] Update libchromiumcontent: fix Release build on
 Windows

---
 common.gypi          | 1 +
 script/lib/config.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.gypi b/common.gypi
index f00e4293ca42..58b33a37bd3c 100644
--- a/common.gypi
+++ b/common.gypi
@@ -49,6 +49,7 @@
           4054,  #
           4055,  # 'type cast' : from data pointer 'void *' to function pointer
           4057,  # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
+          4065,  # switch statement contains 'default' but no 'case' labels
           4189,  #
           4131,  # uses old-style declarator
           4133,  # incompatible types
diff --git a/script/lib/config.py b/script/lib/config.py
index 567701a057ab..7b70a7308820 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = 'f615ab6da33c860d526286a65dbb89b21074a784'
+LIBCHROMIUMCONTENT_COMMIT = 'e5ddff3e0d277703e2c1adc363d49709cf1bc56a'
 
 PLATFORM = {
   'cygwin': 'win32',

From 2d7b5c53b17d8945fe2aa627c36addc97ac95283 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 21:08:16 +0900
Subject: [PATCH 158/510] Change version number so native modules can build

---
 electron.gyp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron.gyp b/electron.gyp
index 1dcc515611a2..090008a67ffb 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.0.2',
+    'version%': '1.1.0',
   },
   'includes': [
     'filenames.gypi',

From 08779eb6d952d79428aab27a794f81dc89c73c89 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 10 May 2016 21:25:15 +0900
Subject: [PATCH 159/510] Use VS2015 on appveyor

---
 appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0fa0c0d9bddd..b093d2a2126e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,8 @@
 # http://www.appveyor.com/docs/appveyor-yml
 version: "{build}"
 
+os: Visual Studio 2015
+
 init:
   - git config --global core.autocrlf input
 
@@ -10,7 +12,7 @@ platform:
   - x64
 
 install:
-  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
+  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%
   - cmd: SET PATH=C:\python27;%PATH%
   - cmd: python script/cibuild
 

From f1142cf2b59268ebf2a765f1ad33ca701b47ebed Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 May 2016 22:15:24 +0900
Subject: [PATCH 160/510] Adapt to changes on hash functions of Chrome 50

---
 atom/common/api/atom_api_v8_util.cc | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/atom/common/api/atom_api_v8_util.cc b/atom/common/api/atom_api_v8_util.cc
index 79c00d221289..7b7655c6cd2e 100644
--- a/atom/common/api/atom_api_v8_util.cc
+++ b/atom/common/api/atom_api_v8_util.cc
@@ -14,22 +14,6 @@
 #include "native_mate/dictionary.h"
 #include "v8/include/v8-profiler.h"
 
-// Following code should be removed after we upgraded to Chrome 50.
-#if !defined(COMPILER_MSVC)
-namespace base {
-
-template <typename T1, typename T2>
-inline size_t HashInts(T1 value1, T2 value2) {
-  // This condition is expected to be compile-time evaluated and optimised away
-  // in release builds.
-  if (sizeof(T1) > sizeof(uint32_t) || (sizeof(T2) > sizeof(uint32_t)))
-    return HashInts64(value1, value2);
-
-  return HashInts32(value1, value2);
-}
-
-}  // namespace base
-
 namespace std {
 
 // The hash function used by DoubleIDWeakMap.
@@ -41,7 +25,6 @@ struct hash<std::pair<Type1, Type2>> {
 };
 
 }  // namespace std
-#endif  // defined(COMPILER_MSVC)
 
 namespace mate {
 

From 525d456f7c6464321425dcfb97f01b546287f896 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 13 May 2016 11:14:43 +0900
Subject: [PATCH 161/510] Update to Chrome 50.0.2661.102

---
 atom/common/chrome_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h
index 18abcdecabc3..d7f46761287e 100644
--- a/atom/common/chrome_version.h
+++ b/atom/common/chrome_version.h
@@ -8,7 +8,7 @@
 #ifndef ATOM_COMMON_CHROME_VERSION_H_
 #define ATOM_COMMON_CHROME_VERSION_H_
 
-#define CHROME_VERSION_STRING "50.0.2661.94"
+#define CHROME_VERSION_STRING "50.0.2661.102"
 #define CHROME_VERSION "v" CHROME_VERSION_STRING
 
 #endif  // ATOM_COMMON_CHROME_VERSION_H_

From 29b799de730ad0f0304b19d426113b16f765719c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 13 May 2016 11:18:16 +0900
Subject: [PATCH 162/510] Update clang revision to 261368

---
 script/update-clang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/update-clang.sh b/script/update-clang.sh
index 801d60397145..0175bc2a0730 100755
--- a/script/update-clang.sh
+++ b/script/update-clang.sh
@@ -8,7 +8,7 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION=247874
+CLANG_REVISION=261368
 
 # This is incremented when pushing a new build of Clang at the same revision.
 CLANG_SUB_REVISION=1

From 10f144069db7a0f99ae31d986440e899713d12f7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 13 May 2016 13:41:40 +0900
Subject: [PATCH 163/510] Allow using __weak keyword

---
 electron.gyp     | 4 ++++
 vendor/brightray | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/electron.gyp b/electron.gyp
index 090008a67ffb..e2febbaeee65 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -298,6 +298,10 @@
               '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
             ],
           },
+          'xcode_settings': {
+            # ReactiveCocoa which is used by Squirrel requires using __weak.
+            'CLANG_ENABLE_OBJC_WEAK': 'YES',
+          },
         }],  # OS=="mac" and mas_build==0
         ['OS=="mac" and mas_build==1', {
           'defines': [
diff --git a/vendor/brightray b/vendor/brightray
index 75bda7d2118c..a266ffbdf446 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 75bda7d2118c953b35d8a7d1962067a68dea34fb
+Subproject commit a266ffbdf446b41b9b5d09e55134ebadd774b357

From 847d9580b77f41036d5f3c9720746d3038035aaa Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 13 May 2016 17:00:02 +0900
Subject: [PATCH 164/510] Bump v1.1.0

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 4 ++--
 package.json                          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index adc618a26aae..601eb2566f1f 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.0.2</string>
+  <string>1.1.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.2</string>
+  <string>1.1.0</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 2eb5b1f0a3cf..2339dd7844a5 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,2,0
- PRODUCTVERSION 1,0,2,0
+ FILEVERSION 1,1,0,0
+ PRODUCTVERSION 1,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.0.2"
+            VALUE "FileVersion", "1.1.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.0.2"
+            VALUE "ProductVersion", "1.1.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 86fed8086079..8e58486091b3 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -6,8 +6,8 @@
 #define ATOM_VERSION_H
 
 #define ATOM_MAJOR_VERSION 1
-#define ATOM_MINOR_VERSION 0
-#define ATOM_PATCH_VERSION 2
+#define ATOM_MINOR_VERSION 1
+#define ATOM_PATCH_VERSION 0
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/package.json b/package.json
index 860357dab8c9..1db82777b6d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From bebf8eabca636b662faaf741c73ffc7aca3b6cad Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Fri, 13 May 2016 09:06:52 -0400
Subject: [PATCH 165/510] :apple: Fix context menu positioning

---
 atom/browser/api/atom_api_menu_mac.mm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index d8ee089c1cba..84a8a2a01965 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -46,6 +46,20 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
     position = NSMakePoint(x, [view frame].size.height - y);
   }
 
+  // If no preferred item is specified, try to show all of the menu items.
+  if (!positioning_item) {
+    int windowBottom = CGRectGetMinY([view window].frame);
+    int distaceFromBottom = windowBottom + position.y - [menu size].height;
+    if (distaceFromBottom < 0)
+      position.y = position.y - distaceFromBottom;
+  }
+
+  // Place the menu left of cursor if it is overflowing off right of screen.
+  int windowLeft = CGRectGetMinX([view window].frame);
+  int rightmostPoint = windowLeft + position.x + [menu size].width;
+  if (rightmostPoint > [[NSScreen mainScreen] visibleFrame].size.width)
+    position.x = position.x - [menu size].width;
+
   // Show the menu.
   [menu popUpMenuPositioningItem:item atLocation:position inView:view];
 }

From 61e775c0554b4289d7a6529ab17737076354e813 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Thu, 12 May 2016 13:48:01 -0700
Subject: [PATCH 166/510] Write native_mate converters for
 WebCache::ResourceTypeStat and friends

---
 .../native_mate_converters/blink_converter.cc | 30 +++++++++++++++++++
 .../native_mate_converters/blink_converter.h  | 13 ++++++++
 2 files changed, 43 insertions(+)

diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index 0ae73e9825c8..915e766ea7ee 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -12,6 +12,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "native_mate/dictionary.h"
+#include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
@@ -384,4 +385,33 @@ v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags) {
   return mate::ConvertToV8(isolate, dict);
 }
 
+v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStat>::ToV8(
+    v8::Isolate* isolate,
+    const blink::WebCache::ResourceTypeStat& stat) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+
+  dict.Set("count", (uint32_t)stat.count);
+  dict.Set("size", (uint32_t)(stat.size >> 10));
+  dict.Set("liveSize", (uint32_t)(stat.liveSize >> 10));
+  dict.Set("decodedSize", (uint32_t)(stat.decodedSize >> 10));
+  dict.Set("purgedSize", (uint32_t)(stat.purgedSize >> 10));
+  dict.Set("purgeableSize", (uint32_t)(stat.purgeableSize >> 10));
+
+  return dict.GetHandle();
+}
+
+v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStats>::ToV8(
+    v8::Isolate* isolate,
+    const blink::WebCache::ResourceTypeStats& stats) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+
+  dict.Set("images", mate::ConvertToV8(isolate, stats.images));
+  dict.Set("cssStyleSheets", mate::ConvertToV8(isolate, stats.cssStyleSheets));
+  dict.Set("xslStyleSheets", mate::ConvertToV8(isolate, stats.xslStyleSheets));
+  dict.Set("fonts", mate::ConvertToV8(isolate, stats.fonts));
+  dict.Set("other", mate::ConvertToV8(isolate, stats.other));
+
+  return dict.GetHandle();
+}
+
 }  // namespace mate
diff --git a/atom/common/native_mate_converters/blink_converter.h b/atom/common/native_mate_converters/blink_converter.h
index 514c6ab680c7..a48547e612bd 100644
--- a/atom/common/native_mate_converters/blink_converter.h
+++ b/atom/common/native_mate_converters/blink_converter.h
@@ -6,6 +6,7 @@
 #define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
 
 #include "native_mate/converter.h"
+#include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 
 namespace blink {
@@ -104,6 +105,18 @@ v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags);
 
 v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags);
 
+template<>
+struct Converter<blink::WebCache::ResourceTypeStat> {
+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
+                                   const blink::WebCache::ResourceTypeStat& stat);
+};
+
+template<>
+struct Converter<blink::WebCache::ResourceTypeStats> {
+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
+                                   const blink::WebCache::ResourceTypeStats& stats);
+};
+
 }  // namespace mate
 
 #endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_

From 22a37653943754e1c8bac3807f7a6f704bf17cfc Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Thu, 12 May 2016 13:56:46 -0700
Subject: [PATCH 167/510] Wire up a new method in web frame

---
 atom/renderer/api/atom_api_web_frame.cc | 12 +++++++++++-
 atom/renderer/api/atom_api_web_frame.h  |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
index 0eebc94fc141..173236f59e53 100644
--- a/atom/renderer/api/atom_api_web_frame.cc
+++ b/atom/renderer/api/atom_api_web_frame.cc
@@ -5,6 +5,7 @@
 #include "atom/renderer/api/atom_api_web_frame.h"
 
 #include "atom/common/api/event_emitter_caller.h"
+#include "atom/common/native_mate_converters/blink_converter.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
@@ -13,6 +14,7 @@
 #include "content/public/renderer/render_view.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
+#include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
@@ -168,6 +170,13 @@ mate::Handle<WebFrame> WebFrame::Create(v8::Isolate* isolate) {
   return mate::CreateHandle(isolate, new WebFrame(isolate));
 }
 
+v8::Local<v8::Value> WebFrame::GetResourceUsage(v8::Isolate* isolate) {
+  blink::WebCache::ResourceTypeStats stats;
+
+  blink::WebCache::getResourceTypeStats(&stats);
+  return mate::Converter<blink::WebCache::ResourceTypeStats>::ToV8(isolate, stats);
+}
+
 // static
 void WebFrame::BuildPrototype(
     v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototype) {
@@ -191,7 +200,8 @@ void WebFrame::BuildPrototype(
       .SetMethod("registerURLSchemeAsPrivileged",
                  &WebFrame::RegisterURLSchemeAsPrivileged)
       .SetMethod("insertText", &WebFrame::InsertText)
-      .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript);
+      .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript)
+      .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage);
 }
 
 }  // namespace api
diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h
index e1eeb224930b..60c6159bf124 100644
--- a/atom/renderer/api/atom_api_web_frame.h
+++ b/atom/renderer/api/atom_api_web_frame.h
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "native_mate/handle.h"
 #include "native_mate/wrappable.h"
+#include "third_party/WebKit/public/web/WebCache.h"
 
 namespace blink {
 class WebLocalFrame;
@@ -69,6 +70,9 @@ class WebFrame : public mate::Wrappable<WebFrame> {
   // Excecuting scripts.
   void ExecuteJavaScript(const base::string16& code, mate::Arguments* args);
 
+  // Resource related methods
+  v8::Local<v8::Value> GetResourceUsage(v8::Isolate* isolate);
+
   scoped_ptr<SpellCheckClient> spell_check_client_;
 
   blink::WebLocalFrame* web_frame_;

From d83c36e0fda799aded4506bde34e6772f08fe02b Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Thu, 12 May 2016 14:36:49 -0700
Subject: [PATCH 168/510] Add a way to drop all cached memory

---
 atom/renderer/api/atom_api_web_frame.cc | 12 +++++++++++-
 atom/renderer/api/atom_api_web_frame.h  |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
index 173236f59e53..873f49d62838 100644
--- a/atom/renderer/api/atom_api_web_frame.cc
+++ b/atom/renderer/api/atom_api_web_frame.cc
@@ -10,6 +10,7 @@
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/renderer/api/atom_api_spell_check_client.h"
+#include "base/memory/memory_pressure_listener.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "native_mate/dictionary.h"
@@ -177,6 +178,14 @@ v8::Local<v8::Value> WebFrame::GetResourceUsage(v8::Isolate* isolate) {
   return mate::Converter<blink::WebCache::ResourceTypeStats>::ToV8(isolate, stats);
 }
 
+void WebFrame::PurgeCaches(v8::Isolate* isolate) {
+  isolate->IdleNotificationDeadline(0.5);
+  blink::WebCache::clear();
+
+  base::MemoryPressureListener::NotifyMemoryPressure(
+    base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
+}
+
 // static
 void WebFrame::BuildPrototype(
     v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototype) {
@@ -201,7 +210,8 @@ void WebFrame::BuildPrototype(
                  &WebFrame::RegisterURLSchemeAsPrivileged)
       .SetMethod("insertText", &WebFrame::InsertText)
       .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript)
-      .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage);
+      .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage)
+      .SetMethod("purgeCaches", &WebFrame::PurgeCaches);
 }
 
 }  // namespace api
diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h
index 60c6159bf124..fa45c5a6c56b 100644
--- a/atom/renderer/api/atom_api_web_frame.h
+++ b/atom/renderer/api/atom_api_web_frame.h
@@ -72,6 +72,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
 
   // Resource related methods
   v8::Local<v8::Value> GetResourceUsage(v8::Isolate* isolate);
+  void PurgeCaches(v8::Isolate* isolate);
 
   scoped_ptr<SpellCheckClient> spell_check_client_;
 

From 908084c0fd00fd41a2fc3a81aae3ff5204cc0c74 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Thu, 12 May 2016 15:03:47 -0700
Subject: [PATCH 169/510] Document resource methods

---
 docs/api/web-frame.md | 46 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index de5a21db3db9..f9da778d9578 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -106,4 +106,50 @@ In the browser window some HTML APIs like `requestFullScreen` can only be
 invoked by a gesture from the user. Setting `userGesture` to `true` will remove
 this limitation.
 
+
+### `webFrame.getResourceUsage()`
+
+Returns more detailed memory usage information in kilobytes of Blink's internal
+memory caches. Returns an Object of the following shape:
+
+```js
+{
+  "images": {
+    "count": 22,
+    "size": 2549,         // 2549kb
+    "liveSize": 2542,     // 2542kb, etc...
+    "decodedSize": 478,
+    "purgedSize": 0,
+    "purgeableSize": 0
+  },
+  "cssStyleSheets": {
+    "count": 7,
+    /* ... */
+  },
+  "xslStyleSheets": {
+    "count": 0,
+    /* ... */
+  },
+  "fonts": {
+    "count": 18,
+    /* ... */
+  },
+  "other": {
+    "count": 0,
+    /* ... */
+  }
+}
+```
+
+### `webFrame.purgeCaches()`
+
+Attempts to free memory that is no longer being used (i.e. images from a
+previous navigation, etc etc).
+
+Note that blindly calling this method probably makes Electron slower since it
+will have to refill these emptied caches, you should only call it if an event
+in your app has occured that makes you think your page is actually using less
+memory (i.e. you have navigated from a super heavy page to a mostly empty one,
+and intend to stay there)
+
 [spellchecker]: https://github.com/atom/node-spellchecker

From 6f0057532aa9846c29650d666a7043e77dd92184 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Thu, 12 May 2016 15:58:19 -0700
Subject: [PATCH 170/510] Forgot scripts

---
 atom/common/native_mate_converters/blink_converter.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index 915e766ea7ee..4571298fbcb1 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -406,6 +406,7 @@ v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStats>::ToV8(
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
 
   dict.Set("images", mate::ConvertToV8(isolate, stats.images));
+  dict.Set("scripts", mate::ConvertToV8(isolate, stats.scripts));
   dict.Set("cssStyleSheets", mate::ConvertToV8(isolate, stats.cssStyleSheets));
   dict.Set("xslStyleSheets", mate::ConvertToV8(isolate, stats.xslStyleSheets));
   dict.Set("fonts", mate::ConvertToV8(isolate, stats.fonts));

From 19cba3ff859e59260d87c8f83c0725bfd1bb03a0 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 10:33:56 -0700
Subject: [PATCH 171/510] Use doubles to represent memory size in bytes

---
 atom/common/native_mate_converters/blink_converter.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index 4571298fbcb1..ddee3a1351bf 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -391,11 +391,11 @@ v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStat>::ToV8(
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
 
   dict.Set("count", (uint32_t)stat.count);
-  dict.Set("size", (uint32_t)(stat.size >> 10));
-  dict.Set("liveSize", (uint32_t)(stat.liveSize >> 10));
-  dict.Set("decodedSize", (uint32_t)(stat.decodedSize >> 10));
-  dict.Set("purgedSize", (uint32_t)(stat.purgedSize >> 10));
-  dict.Set("purgeableSize", (uint32_t)(stat.purgeableSize >> 10));
+  dict.Set("size", (double)stat.size);
+  dict.Set("liveSize", (double)stat.liveSize);
+  dict.Set("decodedSize", (double)stat.decodedSize);
+  dict.Set("purgedSize", (double)stat.purgedSize);
+  dict.Set("purgeableSize", (double)stat.purgeableSize);
 
   return dict.GetHandle();
 }

From 652913f8d62e807ab5da8feb23645027098c6702 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 10:43:08 -0700
Subject: [PATCH 172/510] Just return the type directly

---
 atom/renderer/api/atom_api_web_frame.cc | 4 ++--
 atom/renderer/api/atom_api_web_frame.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
index 873f49d62838..e2fff3ca6b12 100644
--- a/atom/renderer/api/atom_api_web_frame.cc
+++ b/atom/renderer/api/atom_api_web_frame.cc
@@ -171,11 +171,11 @@ mate::Handle<WebFrame> WebFrame::Create(v8::Isolate* isolate) {
   return mate::CreateHandle(isolate, new WebFrame(isolate));
 }
 
-v8::Local<v8::Value> WebFrame::GetResourceUsage(v8::Isolate* isolate) {
+blink::WebCache::ResourceTypeStats WebFrame::GetResourceUsage(v8::Isolate* isolate) {
   blink::WebCache::ResourceTypeStats stats;
 
   blink::WebCache::getResourceTypeStats(&stats);
-  return mate::Converter<blink::WebCache::ResourceTypeStats>::ToV8(isolate, stats);
+  return stats;
 }
 
 void WebFrame::PurgeCaches(v8::Isolate* isolate) {
diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h
index fa45c5a6c56b..4543c99e13ff 100644
--- a/atom/renderer/api/atom_api_web_frame.h
+++ b/atom/renderer/api/atom_api_web_frame.h
@@ -71,7 +71,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
   void ExecuteJavaScript(const base::string16& code, mate::Arguments* args);
 
   // Resource related methods
-  v8::Local<v8::Value> GetResourceUsage(v8::Isolate* isolate);
+  blink::WebCache::ResourceTypeStats GetResourceUsage(v8::Isolate* isolate);
   void PurgeCaches(v8::Isolate* isolate);
 
   scoped_ptr<SpellCheckClient> spell_check_client_;

From 2234307d413b06ba5c85bc5bed6ca78818bec7d6 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 10:45:23 -0700
Subject: [PATCH 173/510] Whitespace issues


From 2287ad6d37c0f2bd656beec3e7f65a1a24ff817d Mon Sep 17 00:00:00 2001
From: Serg F <wolferingys@gmail.com>
Date: Fri, 13 May 2016 23:19:56 +0300
Subject: [PATCH 174/510] Update application-distribution.md

---
 docs-translations/ru-RU/tutorial/application-distribution.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-translations/ru-RU/tutorial/application-distribution.md b/docs-translations/ru-RU/tutorial/application-distribution.md
index e8ddd9f22f20..a43be71f65a9 100644
--- a/docs-translations/ru-RU/tutorial/application-distribution.md
+++ b/docs-translations/ru-RU/tutorial/application-distribution.md
@@ -103,7 +103,7 @@ MyApp.app/Contents
 
 ## Rebranding by Rebuilding Electron from Source
 
-Вы также можете ребрендировать Electron изменив имя продукиа и собрав его
+Вы также можете ребрендировать Electron изменив имя продукта и собрав его
 из исходных кодов. Чтобы сделать это вам нужно изменить `atom.gyp` и полностью
 пересобрать Electron.
 

From 2d46f6f66f8ebb5a7eae9b846a09c2ab03d1347f Mon Sep 17 00:00:00 2001
From: Robert Stanfield <robert@stanfield.it>
Date: Fri, 13 May 2016 20:43:10 -0400
Subject: [PATCH 175/510] It isn't entirely clear to me that
 'window-all-closed' is used for this purpose. I originally looked for an
 event that would fire if all windows were closed and the reason was NOT due
 to the application quitting; however, this differs in that it is called
 regardless of whether the app was quitting.

---
 docs/api/app.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index ef69f9e73fc0..262d0ee44e50 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -34,7 +34,7 @@ Emitted when Electron has finished initialization.
 
 Emitted when all windows have been closed.
 
-This event is only emitted when the application is not going to quit. If the
+If you do not subscribe to this event and all windows are closed, the default behavior is to quit the app; however, if you subscribe, you control whether the app quits or not. If the
 user pressed `Cmd + Q`, or the developer called `app.quit()`, Electron will
 first try to close all the windows and then emit the `will-quit` event, and in
 this case the `window-all-closed` event would not be emitted.

From 1bac1a9028167bde392253e45a04872d2cb9060a Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Sat, 14 May 2016 08:35:38 -0400
Subject: [PATCH 176/510] :memo: Fix styling of the context-menu docs [ci skip]

---
 docs/api/web-contents.md | 70 ++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 47e2e4c34911..7d42b8a48ab5 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -319,51 +319,57 @@ Returns:
   * `x` Integer - x coodinate
   * `y` Integer - y coodinate
   * `linkURL` String - URL of the link that encloses the node the context menu
-was invoked on.
+    was invoked on.
   * `linkText` String - Text associated with the link. May be an empty
-string if the contents of the link are an image.
+    string if the contents of the link are an image.
   * `pageURL` String - URL of the top level page that the context menu was
-invoked on.
+    invoked on.
   * `frameURL` String - URL of the subframe that the context menu was invoked
-on.
+    on.
   * `srcURL` String - Source URL for the element that the context menu
-was invoked on. Elements with source URLs are images, audio and video.
+    was invoked on. Elements with source URLs are images, audio and video.
   * `mediaType` String - Type of the node the context menu was invoked on. Can
-be `none`, `image`, `audio`, `video`, `canvas`, `file` or `plugin`.
-  * `mediaFlags` Object - Parameters for the media element the context menu was
-invoked on.
-    * `inError` - Boolean
-    * `isPaused` - Boolean
-    * `isMuted` - Boolean
-    * `hasAudio` - Boolean
-    * `isLooping` - Boolean
-    * `isControlsVisible` - Boolean
-    * `canToggleControls` - Boolean
-    * `canRotate` - Boolean
+    be `none`, `image`, `audio`, `video`, `canvas`, `file` or `plugin`.
   * `hasImageContent` Boolean - Wether the context menu was invoked on an image
-which has non-empty contents.
+    which has non-empty contents.
   * `isEditable` Boolean - Wether the context is editable.
-  * `editFlags` Object - These flags indicate wether the renderer believes it is
-able to perform the corresponding action.
-    * `canUndo` - Boolean
-    * `canRedo` - Boolean
-    * `canCut` - Boolean
-    * `canCopy` - Boolean
-    * `canPaste` - Boolean
-    * `canDelete` - Boolean
-    * `canSelectAll` - Boolean
   * `selectionText` String - Text of the selection that the context menu was
-invoked on.
+    invoked on.
   * `titleText` String - Title or alt text of the selection that the context
-was invoked on.
+    was invoked on.
   * `misspelledWord` String - The misspelled word under the cursor, if any.
   * `frameCharset` String - The character encoding of the frame on which the
-menu was invoked.
+    menu was invoked.
   * `inputFieldType` String - If the context menu was invoked on an input
-field, the type of that field. Possible values are `none`, `plainText`,
-`password`, `other`.
+    field, the type of that field. Possible values are `none`, `plainText`,
+    `password`, `other`.
   * `menuSourceType` String - Input source that invoked the context menu.
-Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`.
+    Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`.
+  * `mediaFlags` Object - The flags for the media element the context menu was
+    invoked on. See more about this below.
+  * `editFlags` Object - These flags indicate wether the renderer believes it is
+    able to perform the corresponding action. See more about this below.
+
+The `mediaFlags` is an object with the following properties:
+  * `inError` Boolean - Wether the media element has crashed.
+  * `isPaused` Boolean - Wether the media element is paused.
+  * `isMuted` Boolean - Wether the media element is muted.
+  * `hasAudio` Boolean - Wether the media element has audio.
+  * `isLooping` Boolean - Wether the media element is looping.
+  * `isControlsVisible` Boolean - Wether the media element's controls are
+    visible.
+  * `canToggleControls` Boolean - Wether the media element's controls are
+    toggleable.
+  * `canRotate` Boolean - Wether the media element can be rotated.
+
+The `editFlags` is an object with the following properties:
+  * `canUndo` Boolean - Wether the renderer believes it can undo.
+  * `canRedo` Boolean - Wether the renderer believes it can redo.
+  * `canCut` Boolean - Wether the renderer believes it can cut.
+  * `canCopy` Boolean - Wether the renderer believes it can copy
+  * `canPaste` Boolean - Wether the renderer believes it can paste.
+  * `canDelete` Boolean - Wether the renderer believes it can delete.
+  * `canSelectAll` Boolean - Wether the renderer believes it can select all.
 
 Emitted when there is a new context menu that needs to be handled.
 

From 7459581d1357514ad9d91518bc3517ba4105edbb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 14 May 2016 22:40:18 +0900
Subject: [PATCH 177/510] Fix cpplint warnings

---
 .../native_mate_converters/blink_converter.cc   | 16 ++++++----------
 .../native_mate_converters/blink_converter.h    | 17 +++++++++--------
 atom/renderer/api/atom_api_web_frame.cc         |  4 ++--
 docs/api/web-frame.md                           |  1 -
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index ddee3a1351bf..7e0d180f9603 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -389,14 +389,12 @@ v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStat>::ToV8(
     v8::Isolate* isolate,
     const blink::WebCache::ResourceTypeStat& stat) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-
-  dict.Set("count", (uint32_t)stat.count);
-  dict.Set("size", (double)stat.size);
-  dict.Set("liveSize", (double)stat.liveSize);
-  dict.Set("decodedSize", (double)stat.decodedSize);
-  dict.Set("purgedSize", (double)stat.purgedSize);
-  dict.Set("purgeableSize", (double)stat.purgeableSize);
-
+  dict.Set("count", static_cast<uint32_t>(stat.count));
+  dict.Set("size", static_cast<double>(stat.size));
+  dict.Set("liveSize", static_cast<double>(stat.liveSize));
+  dict.Set("decodedSize", static_cast<double>(stat.decodedSize));
+  dict.Set("purgedSize", static_cast<double>(stat.purgedSize));
+  dict.Set("purgeableSize", static_cast<double>(stat.purgeableSize));
   return dict.GetHandle();
 }
 
@@ -404,14 +402,12 @@ v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStats>::ToV8(
     v8::Isolate* isolate,
     const blink::WebCache::ResourceTypeStats& stats) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-
   dict.Set("images", mate::ConvertToV8(isolate, stats.images));
   dict.Set("scripts", mate::ConvertToV8(isolate, stats.scripts));
   dict.Set("cssStyleSheets", mate::ConvertToV8(isolate, stats.cssStyleSheets));
   dict.Set("xslStyleSheets", mate::ConvertToV8(isolate, stats.xslStyleSheets));
   dict.Set("fonts", mate::ConvertToV8(isolate, stats.fonts));
   dict.Set("other", mate::ConvertToV8(isolate, stats.other));
-
   return dict.GetHandle();
 }
 
diff --git a/atom/common/native_mate_converters/blink_converter.h b/atom/common/native_mate_converters/blink_converter.h
index a48547e612bd..78275ab62ec9 100644
--- a/atom/common/native_mate_converters/blink_converter.h
+++ b/atom/common/native_mate_converters/blink_converter.h
@@ -101,22 +101,23 @@ struct Converter<blink::WebContextMenuData::InputFieldType> {
       const blink::WebContextMenuData::InputFieldType& in);
 };
 
-v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags);
-
-v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags);
-
 template<>
 struct Converter<blink::WebCache::ResourceTypeStat> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const blink::WebCache::ResourceTypeStat& stat);
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate,
+      const blink::WebCache::ResourceTypeStat& stat);
 };
 
 template<>
 struct Converter<blink::WebCache::ResourceTypeStats> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const blink::WebCache::ResourceTypeStats& stats);
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate,
+      const blink::WebCache::ResourceTypeStats& stats);
 };
 
+v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags);
+v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags);
+
 }  // namespace mate
 
 #endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
index e2fff3ca6b12..46e00ba3978c 100644
--- a/atom/renderer/api/atom_api_web_frame.cc
+++ b/atom/renderer/api/atom_api_web_frame.cc
@@ -171,9 +171,9 @@ mate::Handle<WebFrame> WebFrame::Create(v8::Isolate* isolate) {
   return mate::CreateHandle(isolate, new WebFrame(isolate));
 }
 
-blink::WebCache::ResourceTypeStats WebFrame::GetResourceUsage(v8::Isolate* isolate) {
+blink::WebCache::ResourceTypeStats WebFrame::GetResourceUsage(
+    v8::Isolate* isolate) {
   blink::WebCache::ResourceTypeStats stats;
-
   blink::WebCache::getResourceTypeStats(&stats);
   return stats;
 }
diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index f9da778d9578..de28afe05789 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -106,7 +106,6 @@ In the browser window some HTML APIs like `requestFullScreen` can only be
 invoked by a gesture from the user. Setting `userGesture` to `true` will remove
 this limitation.
 
-
 ### `webFrame.getResourceUsage()`
 
 Returns more detailed memory usage information in kilobytes of Blink's internal

From c74043803245908fd0dd6b49d1bb1d0b433185f8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 14 May 2016 22:48:25 +0900
Subject: [PATCH 178/510] Rename webFrame.purgeCaches to webFrame.clearCache

This matches the name of session.clearCache.
---
 atom/renderer/api/atom_api_web_frame.cc |  5 +--
 atom/renderer/api/atom_api_web_frame.h  |  2 +-
 docs/api/web-frame.md                   | 54 +++++++++++--------------
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
index 46e00ba3978c..d32b5f1c8c46 100644
--- a/atom/renderer/api/atom_api_web_frame.cc
+++ b/atom/renderer/api/atom_api_web_frame.cc
@@ -178,10 +178,9 @@ blink::WebCache::ResourceTypeStats WebFrame::GetResourceUsage(
   return stats;
 }
 
-void WebFrame::PurgeCaches(v8::Isolate* isolate) {
+void WebFrame::ClearCache(v8::Isolate* isolate) {
   isolate->IdleNotificationDeadline(0.5);
   blink::WebCache::clear();
-
   base::MemoryPressureListener::NotifyMemoryPressure(
     base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
 }
@@ -211,7 +210,7 @@ void WebFrame::BuildPrototype(
       .SetMethod("insertText", &WebFrame::InsertText)
       .SetMethod("executeJavaScript", &WebFrame::ExecuteJavaScript)
       .SetMethod("getResourceUsage", &WebFrame::GetResourceUsage)
-      .SetMethod("purgeCaches", &WebFrame::PurgeCaches);
+      .SetMethod("clearCache", &WebFrame::ClearCache);
 }
 
 }  // namespace api
diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h
index 4543c99e13ff..2e120ecb6ae3 100644
--- a/atom/renderer/api/atom_api_web_frame.h
+++ b/atom/renderer/api/atom_api_web_frame.h
@@ -72,7 +72,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
 
   // Resource related methods
   blink::WebCache::ResourceTypeStats GetResourceUsage(v8::Isolate* isolate);
-  void PurgeCaches(v8::Isolate* isolate);
+  void ClearCache(v8::Isolate* isolate);
 
   scoped_ptr<SpellCheckClient> spell_check_client_;
 
diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index de28afe05789..a933b8b48138 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -108,47 +108,41 @@ this limitation.
 
 ### `webFrame.getResourceUsage()`
 
-Returns more detailed memory usage information in kilobytes of Blink's internal
-memory caches. Returns an Object of the following shape:
+Returns an object describing usage information of Blink's internal memory
+caches.
 
-```js
+```javascript
+console.log(webFrame.getResourceUsage())
+```
+
+This will generate:
+
+```javascript
 {
-  "images": {
-    "count": 22,
-    "size": 2549,         // 2549kb
-    "liveSize": 2542,     // 2542kb, etc...
-    "decodedSize": 478,
-    "purgedSize": 0,
-    "purgeableSize": 0
+  images: {
+    count: 22,
+    size: 2549,
+    liveSize: 2542,
+    decodedSize: 478,
+    purgedSize: 0,
+    purgeableSize: 0
   },
-  "cssStyleSheets": {
-    "count": 7,
-    /* ... */
-  },
-  "xslStyleSheets": {
-    "count": 0,
-    /* ... */
-  },
-  "fonts": {
-    "count": 18,
-    /* ... */
-  },
-  "other": {
-    "count": 0,
-    /* ... */
-  }
+  cssStyleSheets: { /* same with "images" */ },
+  xslStyleSheets: { /* same with "images" */ },
+  fonts: { /* same with "images" */ },
+  other: { /* same with "images" */ },
 }
 ```
 
-### `webFrame.purgeCaches()`
+### `webFrame.clearCache()`
 
-Attempts to free memory that is no longer being used (i.e. images from a
-previous navigation, etc etc).
+Attempts to free memory that is no longer being used (like images from a
+previous navigation).
 
 Note that blindly calling this method probably makes Electron slower since it
 will have to refill these emptied caches, you should only call it if an event
 in your app has occured that makes you think your page is actually using less
 memory (i.e. you have navigated from a super heavy page to a mostly empty one,
-and intend to stay there)
+and intend to stay there).
 
 [spellchecker]: https://github.com/atom/node-spellchecker

From d3e359ab2d0b4c439a8b6a378766dc41244926d6 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 14 May 2016 22:50:05 +0900
Subject: [PATCH 179/510] No need for explicit type conversion

---
 .../common/native_mate_converters/blink_converter.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index 7e0d180f9603..684b06a36329 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -402,12 +402,12 @@ v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStats>::ToV8(
     v8::Isolate* isolate,
     const blink::WebCache::ResourceTypeStats& stats) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-  dict.Set("images", mate::ConvertToV8(isolate, stats.images));
-  dict.Set("scripts", mate::ConvertToV8(isolate, stats.scripts));
-  dict.Set("cssStyleSheets", mate::ConvertToV8(isolate, stats.cssStyleSheets));
-  dict.Set("xslStyleSheets", mate::ConvertToV8(isolate, stats.xslStyleSheets));
-  dict.Set("fonts", mate::ConvertToV8(isolate, stats.fonts));
-  dict.Set("other", mate::ConvertToV8(isolate, stats.other));
+  dict.Set("images", stats.images);
+  dict.Set("scripts", stats.scripts);
+  dict.Set("cssStyleSheets", stats.cssStyleSheets);
+  dict.Set("xslStyleSheets", stats.xslStyleSheets);
+  dict.Set("fonts", stats.fonts);
+  dict.Set("other", stats.other);
   return dict.GetHandle();
 }
 

From 3214fdd73f8dbc65e4d98be72bcbad91860bea3a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 14 May 2016 23:11:13 +0900
Subject: [PATCH 180/510] Fix failing CI on OS X

---
 script/bootstrap.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/script/bootstrap.py b/script/bootstrap.py
index 816a6182b201..df1a5792070b 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -52,9 +52,6 @@ def main():
   if PLATFORM != 'win32':
     # Download prebuilt clang binaries.
     update_clang()
-    if not args.disable_clang and args.clang_dir == '':
-      # Build with prebuilt clang.
-      set_clang_env(os.environ)
 
   setup_python_libs()
   update_node_modules('.')
@@ -67,7 +64,7 @@ def main():
 
   create_chrome_version_h()
   touch_config_gypi()
-  run_update(defines)
+  run_update(defines, args.disable_clang, args.clang_dir)
   update_electron_modules('spec', args.target_arch)
 
 
@@ -250,9 +247,14 @@ def touch_config_gypi():
       f.write(content)
 
 
-def run_update(defines):
+def run_update(defines, disable_clang, clang_dir):
+  env = os.environ.copy()
+  if not disable_clang and clang_dir == '':
+    # Build with prebuilt clang.
+    set_clang_env(env)
+
   update = os.path.join(SOURCE_ROOT, 'script', 'update.py')
-  execute_stdout([sys.executable, update, '--defines', defines])
+  execute_stdout([sys.executable, update, '--defines', defines], env)
 
 
 if __name__ == '__main__':

From 5dc88aa543af3c5faa6bb3042e25538c2a5d3f56 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 11:17:46 -0400
Subject: [PATCH 181/510] =?UTF-8?q?=F0=9F=92=84=20Add=20ES6;=20Clean=20up?=
 =?UTF-8?q?=20from=20CoffeeScript=20conversion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/browser/api/app.js | 57 ++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index aed0028ee73e..2b57233fe685 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,33 +1,34 @@
 'use strict'
 
 const {Menu} = require('electron')
-const EventEmitter = require('events').EventEmitter
+const {EventEmitter} = require('events')
 
 const bindings = process.atomBinding('app')
 const downloadItemBindings = process.atomBinding('download_item')
-const app = bindings.app
+const {app} = bindings
 
 Object.setPrototypeOf(app, EventEmitter.prototype)
 
-app.setApplicationMenu = function (menu) {
-  return Menu.setApplicationMenu(menu)
-}
+let appPath = null
 
-app.getApplicationMenu = function () {
-  return Menu.getApplicationMenu()
-}
-
-app.commandLine = {
-  appendSwitch: bindings.appendSwitch,
-  appendArgument: bindings.appendArgument
-}
+Object.assign(app, {
+  getAppPath() { return appPath },
+  setAppPath(path) { appPath = path },
+  setApplicationMenu(menu) {
+    return Menu.setApplicationMenu(menu)
+  },
+  getApplicationMenu() {
+    return Menu.getApplicationMenu()
+  },
+  commandLine: {
+    appendSwitch: bindings.appendSwitch,
+    appendArgument: bindings.appendArgument
+  }
+})
 
 if (process.platform === 'darwin') {
   app.dock = {
-    bounce: function (type) {
-      if (type == null) {
-        type = 'informational'
-      }
+    bounce (type = 'informational') {
       return bindings.dockBounce(type)
     },
     cancelBounce: bindings.dockCancelBounce,
@@ -41,30 +42,16 @@ if (process.platform === 'darwin') {
   }
 }
 
-var appPath = null
-
-app.setAppPath = function (path) {
-  appPath = path
-}
-
-app.getAppPath = function () {
-  return appPath
-}
-
 // Routes the events to webContents.
-var ref1 = ['login', 'certificate-error', 'select-client-certificate']
-var fn = function (name) {
-  return app.on(name, function (event, webContents, ...args) {
+const events = ['login', 'certificate-error', 'select-client-certificate']
+for (let name of events) {
+  app.on(name, (event, webContents, ...args) => {
     return webContents.emit.apply(webContents, [name, event].concat(args))
   })
 }
-var i, len
-for (i = 0, len = ref1.length; i < len; i++) {
-  fn(ref1[i])
-}
 
 // Wrappers for native classes.
-var wrapDownloadItem = function (downloadItem) {
+const wrapDownloadItem = (downloadItem) => {
   // downloadItem is an EventEmitter.
   Object.setPrototypeOf(downloadItem, EventEmitter.prototype)
 }

From 0785c3bd156ee1bfbec433b7afb224a558e7f250 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 11:31:08 -0400
Subject: [PATCH 182/510] :lipstick: Add spaces to comply with Standard

---
 lib/browser/api/app.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 2b57233fe685..d538e66e7e89 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -12,12 +12,12 @@ Object.setPrototypeOf(app, EventEmitter.prototype)
 let appPath = null
 
 Object.assign(app, {
-  getAppPath() { return appPath },
-  setAppPath(path) { appPath = path },
-  setApplicationMenu(menu) {
+  getAppPath () { return appPath },
+  setAppPath (path) { appPath = path },
+  setApplicationMenu (menu) {
     return Menu.setApplicationMenu(menu)
   },
-  getApplicationMenu() {
+  getApplicationMenu () {
     return Menu.getApplicationMenu()
   },
   commandLine: {

From 0b5efcbc75aab8e42ea967158c4dde335b42176b Mon Sep 17 00:00:00 2001
From: "TAKAHASHI, Kyohei" <kcrt@kcrt.net>
Date: Sun, 15 May 2016 00:36:11 +0900
Subject: [PATCH 183/510] wrong link destination

---
 docs/faq/electron-faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq/electron-faq.md b/docs/faq/electron-faq.md
index 239b4411d42e..cefc5a54a2c7 100644
--- a/docs/faq/electron-faq.md
+++ b/docs/faq/electron-faq.md
@@ -9,7 +9,7 @@ depends on the amount of work involved with upgrading.
 Only the stable channel of Chrome is used. If an important fix is in beta or dev
 channel, we will back-port it.
 
-For more information, please see the [security introduction](../tutorial/electron-security.md).
+For more information, please see the [security introduction](../tutorial/security.md).
 
 ## When will Electron upgrade to latest Node.js?
 

From e5036c0988a67db0fa8497b472872ec75dc220cb Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 12:28:28 -0400
Subject: [PATCH 184/510] Use anonymous function for wrapping native classes

---
 lib/browser/api/app.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index d538e66e7e89..de417943eb5d 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -51,12 +51,10 @@ for (let name of events) {
 }
 
 // Wrappers for native classes.
-const wrapDownloadItem = (downloadItem) => {
+downloadItemBindings._setWrapDownloadItem((downloadItem) => {
   // downloadItem is an EventEmitter.
   Object.setPrototypeOf(downloadItem, EventEmitter.prototype)
-}
-
-downloadItemBindings._setWrapDownloadItem(wrapDownloadItem)
+})
 
 // Only one App object pemitted.
 module.exports = app

From 88d158f2c1a02afc882c6074d68fd4f44a29402c Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Sun, 15 May 2016 02:02:51 +0900
Subject: [PATCH 185/510] Translate tutorial/security.md to Japanese.

---
 docs-translations/jp/README.md            |  1 +
 docs-translations/jp/faq/electron-faq.md  |  8 ++--
 docs-translations/jp/tutorial/security.md | 45 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 docs-translations/jp/tutorial/security.md

diff --git a/docs-translations/jp/README.md b/docs-translations/jp/README.md
index a71661a7e535..63abb646efc7 100644
--- a/docs-translations/jp/README.md
+++ b/docs-translations/jp/README.md
@@ -13,6 +13,7 @@ _リンクになっていないリストは未翻訳のものです。_
 ## ガイド
 
 * [サポートするプラットフォーム](tutorial/supported-platforms.md)
+* [セキュリティ](tutorial/security.md)
 * [アプリケーションの配布](tutorial/application-distribution.md)
 * [Mac App Store 提出ガイド](tutorial/mac-app-store-submission-guide.md)
 * [アプリケーションのパッケージ化](tutorial/application-packaging.md)
diff --git a/docs-translations/jp/faq/electron-faq.md b/docs-translations/jp/faq/electron-faq.md
index eef30c013a3f..3991b71953cd 100644
--- a/docs-translations/jp/faq/electron-faq.md
+++ b/docs-translations/jp/faq/electron-faq.md
@@ -2,10 +2,12 @@
 
 ## Electronは、いつ最新のChromeにアップグレードされますか?
 
-ElectronのChromeバージョンは、通常、新しいChromeのstabeleバージョンがリリースされた後、1～2週間以内に上げられます。
+ElectronのChromeバージョンは、通常、新しいChromeのstabeleバージョンがリリースされた後、1～2週間以内に上げられます。ただし、この期間というのは保障されてはおらず、またバージョンアップでの作業量に左右されます。
 
 また、Chromeのstableチャンネルのみを使用し、もし、重要な修正がbetaまたはdevチャンネルにある場合、それをバックポートします。
 
+もっと知りたければ、[セキュリティについて](../tutorial/security.md)をご参照ください。
+
 ## Electronは、いつ最新のNode.jsにアップグレードされますか?
 
 Node.js の新しいバージョンがリリースされたとき、私たちは Electron の Node.js を更新するのを通常約1か月待ちます。そのようにして、とても頻繁に発生している、新しい Node.js バージョンによって取り込まれたバグによる影響を避けることができます。
@@ -69,7 +71,7 @@ Electronに組み込まれているNode.jsの影響で, `module`, `exports`, `re
 
 ```javascript
 // In the main process.
-var mainWindow = new BrowserWindow({
+var win = new BrowserWindow({
   webPreferences: {
     nodeIntegration: false
   }
@@ -113,7 +115,7 @@ console.log(require.resolve('electron'));
 "/path/to/Electron.app/Contents/Resources/atom.asar/renderer/api/lib/exports/electron.js"
 ```
 
-If it is something like もし、`node_modules/electron/index.js`　のような形式の場合は、npm `electron` モジュールを削除するか、それをリネームします。
+もし、`node_modules/electron/index.js`　のような形式の場合は、npm `electron` モジュールを削除するか、それをリネームします。
 
 ```bash
 npm uninstall electron
diff --git a/docs-translations/jp/tutorial/security.md b/docs-translations/jp/tutorial/security.md
new file mode 100644
index 000000000000..f1ab7a9278d1
--- /dev/null
+++ b/docs-translations/jp/tutorial/security.md
@@ -0,0 +1,45 @@
+# セキュリティ・ネイティブ実行で出来ること・あなたの責任
+
+Web開発者として、通常私たちはブラウザの強力なセキュリティ機能の恩恵を受けていますーそのため、書いたコードによる危険性は比較的小さいものです。
+ウェブサイトはサンドボックス内で限定された能力のみを使用することが許されていて、また、新しく見つかったセキュリティ脆弱性に素早く対処してくれるたくさんのプログラマチームによって作られたブラウザをユーザーが使ってくれています。
+
+Electronを使用するにあたって、「Electronはウェブブラウザではない」ということを理解するのが大切です。使い慣れたWebテクノロジで豊富な機能を持ったデスクトップアプリケーションを作ることができますが、書いたコードはより強力な力を行使することのできるものです。JavaScriptでファイルシステム・シェルなどにアクセスすることができます。これによって、高機能なネイティブアプリケーションを作ることができますが、コードが許された力に比例して、受けるセキュリティリスクも大きいものになります。
+
+そのことを頭に入れて、信頼できないソースから得られた任意の内容を表示することは、Electronが意図しない重要なセキュリティリスクを生み出すことに注意してください。
+実際、多くのElectronアプリケーション(Atom, Slack, Visual Studio Code など)は主としてローカルにあるファイルの内容(やNode integration外の信頼できる内容)を表示します。もしアプリケーション上でオンライン上から得られるコードを実行する場合、内容が悪意のあるものでないことを確認するのはあなたの責任です。
+
+
+# Chromium のセキュリティ問題とアップグレード
+
+Electronは新しいバージョンのChromiumを出来るだけ早くサポートするように努力をしてはいますが、アップグレードは数十、時には数百のファイルの編集を含む大変な左表であることを後理解ください。たくさんのリソースと貢献を受けていますが、ElectronはChromium最新版に追いついてないこともあり、数日・数週間遅れることがあります。
+
+現在のChromiumコンポーネントのアップデートシステムは、使用できるリソースとほとんどのアプリケーションの需要を満たす、適切なバランスの場所にあると思います。我々は、Electronを使用する個々のケースに関する意見をいただきたいと思っています。この件に関するPull requestと貢献をいつでも歓迎します。
+
+
+## 上記の忠告を無視した場合
+リモートで得られたコードをローカルで実行した場合、セキュリティ問題が発生することになります。
+例えば、ブラウザでリモートのウェブサイトを表示することを考えてみてください。
+もし攻撃者がどうにかして(情報源そのものの攻撃や中間者攻撃によって)得られる内容を変更した場合、ユーザーのPC上でネイティブコードを実行できることになります。
+
+> :warning: Node integration有効な環境で、リモートコードの読み込みと実行を行うべきではありません。代わりに、Nodeコードの実行にはローカルのファイルを使用してください。
+リモートのデータの内容を表示するには`webview`を使用して、`nodeIntegration`を無効にしてください。
+
+#### チェックリスト
+このリストは、防弾チョッキのように攻撃を防げるものではないですが、最低限あなたがしなければいけないことを記載しています。
+
+* セキュア(https)な内容のみを表示してください。
+* リモートの内容を表示する全てのレンダラでNode integrationを無効にしてください (`webPreferences`を使用)
+* `webSecurity`を無効にしないください。無効にすると、same-origin policyが無効になります。
+* 
+* [`Content-Security-Policy`](http://www.html5rocks.com/en/tutorials/security/content-security-policy/)を定義して、スクリプトの読み込み元を制限してください。(例: `script-src 'self'`)
+* [`eval`を無効にしてください。](https://github.com/nylas/N1/blob/0abc5d5defcdb057120d726b271933425b75b415/static/index.js#L6) evalは文字列をコードとして実行してしまいます。
+* `allowDisplayingInsecureContent` を有効にしないでください。
+* `allowRunningInsecureContent` を有効にしないでください。
+* しっかり理解していない限りは`experimentalFeatures`や`experimentalCanvasFeatures`を有効にしないでください。
+* しっかり理解していない限りは`blinkFeatures`を有効にしないでください。
+* WebView: `nodeintegration`を無効にしてください。
+* WebView: `disablewebsecurity`を使用しないでください。
+* WebView: `allowpopups`を使用しないでください。
+* WebView: `insertCSS`や`executeJavaScript`を外部のCSS/JSに使用しないでください。
+
+再確認ですが、このリストは単にリスクを小さくするもので、リスクをなくすものではありません。もしウェブサイトを表示することが目的なら、ブラウザを使うのがより安全な選択肢です。

From 6ac24f592ced813c674265585ad8085b5900cea1 Mon Sep 17 00:00:00 2001
From: Adriano Godoy <godoy.ccp@gmail.com>
Date: Sat, 14 May 2016 16:01:52 -0300
Subject: [PATCH 186/510] Translate tutorial/devtools-extension.md to
 Portuguese (pt-br).

---
 .../pt-BR/tutorial/devtools-extension.md      | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 docs-translations/pt-BR/tutorial/devtools-extension.md

diff --git a/docs-translations/pt-BR/tutorial/devtools-extension.md b/docs-translations/pt-BR/tutorial/devtools-extension.md
new file mode 100644
index 000000000000..958b70c2e1e6
--- /dev/null
+++ b/docs-translations/pt-BR/tutorial/devtools-extension.md
@@ -0,0 +1,46 @@
+# Extensão DevTools
+
+Para facilitar a depuração, o Electron provê suporte para a extensão [Chrome DevTools][devtools-extension].
+
+Para a maioria das extensões DevTools você pode simplesmente baixar o código-fonte e usar a função  `BrowserWindow.addDevToolsExtension` para carregá-las. As extensões carregadas serão lembradas, assim você não precisa carregar sempre que criar uma nova janela.
+
+**NOTA: Se o DevTools React não funcionar, verifique a issue https://github.com/electron/electron/issues/915**
+
+Por exemplo, para usar a extensão [React DevTools](https://github.com/facebook/react-devtools), primeiro você deve baixar seu código-fonte:
+
+```bash
+$ cd /some-directory
+$ git clone --recursive https://github.com/facebook/react-devtools.git
+```
+
+Siga as instruções em  [`react-devtools/shells/chrome/Readme.md`](https://github.com/facebook/react-devtools/blob/master/shells/chrome/Readme.md) para fazer o build da extensão.
+
+Agora você poderá carregar a extensão no Electron abrindo o   DevTools em qualquer janela, e executando o seguinte código no console do DevTools:
+
+```javascript
+const BrowserWindow = require('electron').remote.BrowserWindow;
+BrowserWindow.addDevToolsExtension('/some-directory/react-devtools/shells/chrome');
+```
+
+Para remover a extensão, você pode executar a chamada    `BrowserWindow.removeDevToolsExtension`
+com o nome da extensão e ela não será carregada na próxima vez que você abrir o DevTools:
+
+```javascript
+BrowserWindow.removeDevToolsExtension('React Developer Tools');
+```
+
+## Formato das extensões DevTools
+
+Idealmente todas as extensões DevTools escritas para o navegador Chrome podem ser carregadas pelo Electron, mas elas devem estar em um diretório. Pacotes com extensão `crx` não podem ser carregados pelo Electron a não ser que tenha uma forma de extraí-los em um diretório.
+
+## Páginas em segundo plano (background pages)
+
+Atualmente o Electron não suporta páginas em segundo plano nas extensões do Chrome, então extensões com essa característica podem não funcionar no Electron.
+
+## APIs `chrome.*`
+
+Algumas extensões do Chrome podem usar a API `chrome.*`. Apesar de um esforço na implementação destas APIs no Electron, elas ainda não estão finalizadas.
+
+Dado que nem todas as funções `chrome.*` esstão implementadas, algumas extensões que utilizam `chrome.devtools.*` podem não funcionar. Você pode reportar este erro no issue tracker para que possamos adicionar suporte a essas APIs.
+
+[devtools-extension]: https://developer.chrome.com/extensions/devtools

From fb161d5f1f3600e4728f617c2e41e48e0b9e6876 Mon Sep 17 00:00:00 2001
From: Adriano Godoy <godoy.ccp@gmail.com>
Date: Sat, 14 May 2016 16:06:11 -0300
Subject: [PATCH 187/510] PT-BR link to devtools-extension tutorial on
 README.md

---
 docs-translations/pt-BR/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs-translations/pt-BR/README.md b/docs-translations/pt-BR/README.md
index 05fedfeb4381..8498ca420fc8 100644
--- a/docs-translations/pt-BR/README.md
+++ b/docs-translations/pt-BR/README.md
@@ -1,7 +1,7 @@
 Por favor, certifique-se de que está utilizando a documentação que corresponde à sua versão do Electron.
 O número da versão deve ser uma parte da URL da página. Se não for, você provavelmente está utilizando
 a documentação de um branch de desenvolvimento que pode conter mudanças na API que não são compatíveis
-com a sua versão do Electron. Se este for o caso, você pode mudar para uma versão diferente da 
+com a sua versão do Electron. Se este for o caso, você pode mudar para uma versão diferente da
 documentação na lista de [versões disponíveis](http://electron.atom.io/docs/) em atom.io,
 ou se você estiver usando a interface do GitHub, abra o *dropdown* "Switch branches/tags" e
 selecione a *tag* que corresponde à sua versão.
@@ -20,7 +20,7 @@ Existem muitas perguntas comuns que são feitas, verifique antes de criar uma is
 * [Usando Módulos Nativos do Node](tutorial/using-native-node-modules.md)
 * [Depuração do Processo Principal](tutorial/debugging-main-process.md)
 * [Usando Selenium e WebDriver](../../docs/tutorial/using-selenium-and-webdriver.md)
-* [Extensão DevTools](../../docs/tutorial/devtools-extension.md)
+* [Extensão DevTools](tutorial/devtools-extension.md)
 * [Usando o Plugin Pepper Flash](tutorial/using-pepper-flash-plugin.md)
 * [Usando o Plugin Widevine CDM](../../tutorial/using-widevine-cdm-plugin.md)
 

From b1275420a3b4b726908aefb292cb5b1a69e9b6df Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 19:43:30 -0400
Subject: [PATCH 188/510] Require download_items inline

---
 lib/browser/api/app.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index de417943eb5d..291994363648 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -4,7 +4,6 @@ const {Menu} = require('electron')
 const {EventEmitter} = require('events')
 
 const bindings = process.atomBinding('app')
-const downloadItemBindings = process.atomBinding('download_item')
 const {app} = bindings
 
 Object.setPrototypeOf(app, EventEmitter.prototype)
@@ -51,7 +50,7 @@ for (let name of events) {
 }
 
 // Wrappers for native classes.
-downloadItemBindings._setWrapDownloadItem((downloadItem) => {
+process.atomBinding('download_item')._setWrapDownloadItem((downloadItem) => {
   // downloadItem is an EventEmitter.
   Object.setPrototypeOf(downloadItem, EventEmitter.prototype)
 })

From 861a79dd6a3e9415dab7a9f7fcb166af995dc6f7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 15 May 2016 09:41:02 +0900
Subject: [PATCH 189/510] Suppress the tests that need to call window.open on
 Travis CI

---
 spec/webview-spec.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index d2c37c857df1..36997a13c78a 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -321,6 +321,10 @@ describe('<webview> tag', function () {
   })
 
   describe('allowpopups attribute', function () {
+    if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
+      return
+    }
+
     it('can not open new window when not set', function (done) {
       var listener = function (e) {
         assert.equal(e.message, 'null')
@@ -346,6 +350,10 @@ describe('<webview> tag', function () {
   })
 
   describe('new-window event', function () {
+    if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
+      return
+    }
+
     it('emits when window.open is called', function (done) {
       webview.addEventListener('new-window', function (e) {
         assert.equal(e.url, 'http://host/')

From f43b9665c13a8b84acb0b9647d177bc861ce141a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 15 May 2016 10:00:29 +0900
Subject: [PATCH 190/510] And increase timeout for the rest

---
 spec/webview-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 36997a13c78a..e8a82a15ed39 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -5,7 +5,7 @@ const url = require('url')
 const {app, session, ipcMain, BrowserWindow} = require('electron').remote
 
 describe('<webview> tag', function () {
-  this.timeout(10000)
+  this.timeout(20000)
 
   var fixtures = path.join(__dirname, 'fixtures')
   var webview = null

From 800ab50b56b6a724c2fd3e3766bcabcc9be35a32 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 15 May 2016 10:30:19 +0900
Subject: [PATCH 191/510] Download redist files of VS2015

---
 script/create-dist.py              | 6 +++---
 script/update-external-binaries.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/create-dist.py b/script/create-dist.py
index e25845432c77..56a42e794e44 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -36,8 +36,7 @@ TARGET_BINARIES = {
     'icudtl.dat',
     'libEGL.dll',
     'libGLESv2.dll',
-    'msvcp120.dll',
-    'msvcr120.dll',
+    'msvcp140.dll',
     'ffmpeg.dll',
     'node.dll',
     'content_resources_200_percent.pak',
@@ -45,7 +44,8 @@ TARGET_BINARIES = {
     'xinput1_3.dll',
     'natives_blob.bin',
     'snapshot_blob.bin',
-    'vccorlib120.dll',
+    'vccorlib140.dll',
+    'vcruntime140.dll',
   ],
   'linux': [
     PROJECT_NAME,  # 'electron'
diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py
index fae268ea8cb7..35e6325adfae 100755
--- a/script/update-external-binaries.py
+++ b/script/update-external-binaries.py
@@ -8,7 +8,7 @@ from lib.config import get_target_arch
 from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
 
 
-VERSION = 'v0.8.0'
+VERSION = 'v1.0.0'
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 FRAMEWORKS_URL = 'http://github.com/atom/atom-shell-frameworks/releases' \
                  '/download/' + VERSION
@@ -30,7 +30,7 @@ def main():
     download_and_unzip('Squirrel')
   elif sys.platform in ['cygwin', 'win32']:
     download_and_unzip('directxsdk-' + get_target_arch())
-    download_and_unzip('vs2012-crt-' + get_target_arch())
+    download_and_unzip('vs2015-crt-' + get_target_arch())
 
   with open(version_file, 'w') as f:
     f.write(VERSION)

From ba7a32b16e02e460c789efcf9b6f8619b27ba033 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 15 May 2016 10:33:23 +0900
Subject: [PATCH 192/510] Sync submodule recursively

---
 script/bootstrap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bootstrap.py b/script/bootstrap.py
index df1a5792070b..9087c99dbcdd 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -122,7 +122,7 @@ def check_root():
 
 
 def update_submodules():
-  execute_stdout(['git', 'submodule', 'sync'])
+  execute_stdout(['git', 'submodule', 'sync', '--recursive'])
   execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
 
 

From 8ed3659bb85685097552c584a8c20660079e916c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 15 May 2016 10:41:43 +0900
Subject: [PATCH 193/510] Link with libraries of Visual Studio 2015

---
 electron.gyp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/electron.gyp b/electron.gyp
index e2febbaeee65..f4172866c047 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -157,9 +157,9 @@
                 '<(libchromiumcontent_dir)/snapshot_blob.bin',
                 'external_binaries/d3dcompiler_47.dll',
                 'external_binaries/xinput1_3.dll',
-                'external_binaries/msvcp120.dll',
-                'external_binaries/msvcr120.dll',
-                'external_binaries/vccorlib120.dll',
+                'external_binaries/msvcp140.dll',
+                'external_binaries/vccorlib140.dll',
+                'external_binaries/vcruntime140.dll',
               ],
             },
           ],

From c11d18fe0645fcc8136a042a847defb2f0a18692 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 11:49:07 -0400
Subject: [PATCH 194/510] :lipstick: Destructure globalShortcut module

:lipstick: Remove globalShortcut property

Add back the globalShortcut property
---
 lib/browser/api/global-shortcut.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/browser/api/global-shortcut.js b/lib/browser/api/global-shortcut.js
index a8fa0e241fe3..9654e095fc06 100644
--- a/lib/browser/api/global-shortcut.js
+++ b/lib/browser/api/global-shortcut.js
@@ -1,5 +1 @@
-var globalShortcut
-
-globalShortcut = process.atomBinding('global_shortcut').globalShortcut
-
-module.exports = globalShortcut
+module.exports = process.atomBinding('global_shortcut').globalShortcut

From 236810a9230bcb4bc0f4e6e0ef2a18348f272104 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 11:41:34 -0400
Subject: [PATCH 195/510] =?UTF-8?q?=F0=9F=92=84=20Use=20ES6;=20clean=20up?=
 =?UTF-8?q?=20CoffeeScript=20conversion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:lipstick: Destructure app module

Address linting errors
---
 lib/browser/api/browser-window.js | 164 +++++++++++++-----------------
 1 file changed, 69 insertions(+), 95 deletions(-)

diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index 1cfd84bebc56..43a8b3203bd7 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -1,28 +1,24 @@
 'use strict'
 
-const ipcMain = require('electron').ipcMain
-const EventEmitter = require('events').EventEmitter
+const {ipcMain} = require('electron')
+const {EventEmitter} = require('events')
 const {BrowserWindow} = process.atomBinding('window')
 
 Object.setPrototypeOf(BrowserWindow.prototype, EventEmitter.prototype)
 
 BrowserWindow.prototype._init = function () {
-  // avoid recursive require.
-  var app, menu
-  app = require('electron').app
+  // Avoid recursive require.
+  const {app} = require('electron')
 
   // Simulate the application menu on platforms other than OS X.
   if (process.platform !== 'darwin') {
-    menu = app.getApplicationMenu()
-    if (menu != null) {
-      this.setMenu(menu)
-    }
+    const menu = app.getApplicationMenu()
+    if (menu) this.setMenu(menu)
   }
 
   // Make new windows requested by links behave like "window.open"
   this.webContents.on('-new-window', (event, url, frameName, disposition) => {
-    var options
-    options = {
+    const options = {
       show: true,
       width: 800,
       height: 600
@@ -54,12 +50,14 @@ BrowserWindow.prototype._init = function () {
     if (!event.defaultPrevented) this.setTitle(title)
   })
 
-  // Sometimes the webContents doesn't get focus when window is shown, so we have
-  // to force focusing on webContents in this case. The safest way is to focus it
-  // when we first start to load URL, if we do it earlier it won't have effect,
-  // if we do it later we might move focus in the page.
+  // Sometimes the webContents doesn't get focus when window is shown, so we 
+  // have to force focusing on webContents in this case. The safest way is to 
+  // focus it when we first start to load URL, if we do it earlier it won't 
+  // have effect, if we do it later we might move focus in the page.
+  //
   // Though this hack is only needed on OS X when the app is launched from
-  // Finder, we still do it on all platforms in case of other bugs we don't know.
+  // Finder, we still do it on all platforms in case of other bugs we don't 
+  // know.
   this.webContents.once('load-url', function () {
     this.focus()
   })
@@ -74,18 +72,18 @@ BrowserWindow.prototype._init = function () {
 
   // Subscribe to visibilityState changes and pass to renderer process.
   let isVisible = this.isVisible() && !this.isMinimized()
-  let visibilityChanged = () => {
-    let newState = this.isVisible() && !this.isMinimized()
+  const visibilityChanged = () => {
+    const newState = this.isVisible() && !this.isMinimized()
     if (isVisible !== newState) {
       isVisible = newState
       this.webContents.send('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', isVisible ? 'visible' : 'hidden')
     }
   }
-  this.on('show', visibilityChanged)
-  this.on('hide', visibilityChanged)
-  this.on('minimize', visibilityChanged)
-  this.on('restore', visibilityChanged)
-  this.on('maximize', visibilityChanged)
+  
+  const visibilityEvents = ['show', 'hide', 'minimize', 'maximize', 'restore']
+  for (let event of visibilityEvents) {
+    this.on(event, visibilityChanged)
+  }
 
   // Notify the creation of the window.
   app.emit('browser-window-created', {}, this)
@@ -93,90 +91,66 @@ BrowserWindow.prototype._init = function () {
   Object.defineProperty(this, 'devToolsWebContents', {
     enumerable: true,
     configurable: false,
-    get: function () {
+    get () {
       return this.webContents.devToolsWebContents
     }
   })
 }
 
-BrowserWindow.getFocusedWindow = function () {
-  var i, len, window, windows
-  windows = BrowserWindow.getAllWindows()
-  for (i = 0, len = windows.length; i < len; i++) {
-    window = windows[i]
-    if (window.isFocused()) {
-      return window
-    }
-  }
-  return null
-}
-
-BrowserWindow.fromWebContents = function (webContents) {
-  var i, len, ref1, window, windows
-  windows = BrowserWindow.getAllWindows()
-  for (i = 0, len = windows.length; i < len; i++) {
-    window = windows[i]
-    if ((ref1 = window.webContents) != null ? ref1.equal(webContents) : void 0) {
-      return window
-    }
+BrowserWindow.getFocusedWindow = () => {
+  for (let window of BrowserWindow.getAllWindows()) {
+    if (window.isFocused()) return window
   }
 }
 
-BrowserWindow.fromDevToolsWebContents = function (webContents) {
-  var i, len, ref1, window, windows
-  windows = BrowserWindow.getAllWindows()
-  for (i = 0, len = windows.length; i < len; i++) {
-    window = windows[i]
-    if ((ref1 = window.devToolsWebContents) != null ? ref1.equal(webContents) : void 0) {
-      return window
-    }
+BrowserWindow.fromWebContents = (webContents) => {
+  for (let window of BrowserWindow.getAllWindows()) {
+    if (window.webContents.equal(webContents)) return window
+  }
+}
+
+BrowserWindow.fromDevToolsWebContents = (webContents) => {
+  for (let window of BrowserWindow.getAllWindows()) {
+    if (window.devToolsWebContents.equal(webContents)) return window
   }
 }
 
 // Helpers.
 
-BrowserWindow.prototype.loadURL = function () {
-  return this.webContents.loadURL.apply(this.webContents, arguments)
-}
-
-BrowserWindow.prototype.getURL = function () {
-  return this.webContents.getURL()
-}
-
-BrowserWindow.prototype.reload = function () {
-  return this.webContents.reload.apply(this.webContents, arguments)
-}
-
-BrowserWindow.prototype.send = function () {
-  return this.webContents.send.apply(this.webContents, arguments)
-}
-
-BrowserWindow.prototype.openDevTools = function () {
-  return this.webContents.openDevTools.apply(this.webContents, arguments)
-}
-
-BrowserWindow.prototype.closeDevTools = function () {
-  return this.webContents.closeDevTools()
-}
-
-BrowserWindow.prototype.isDevToolsOpened = function () {
-  return this.webContents.isDevToolsOpened()
-}
-
-BrowserWindow.prototype.isDevToolsFocused = function () {
-  return this.webContents.isDevToolsFocused()
-}
-
-BrowserWindow.prototype.toggleDevTools = function () {
-  return this.webContents.toggleDevTools()
-}
-
-BrowserWindow.prototype.inspectElement = function () {
-  return this.webContents.inspectElement.apply(this.webContents, arguments)
-}
-
-BrowserWindow.prototype.inspectServiceWorker = function () {
-  return this.webContents.inspectServiceWorker()
-}
+Object.assign(BrowserWindow.prototype, {
+  loadURL () {
+    return this.webContents.loadURL.apply(this.webContents, arguments)
+  },
+  getURL () {
+    return this.webContents.getURL()
+  },
+  reload () {
+    return this.webContents.reload.apply(this.webContents, arguments)
+  },
+  send () {
+    return this.webContents.send.apply(this.webContents, arguments)
+  },
+  openDevTools () {
+    return this.webContents.openDevTools.apply(this.webContents, arguments)
+  },
+  closeDevTools () {
+    return this.webContents.closeDevTools()
+  },
+  isDevToolsOpened () {
+    return this.webContents.isDevToolsOpened()
+  },
+  isDevToolsFocused () {
+    return this.webContents.isDevToolsFocused()
+  },
+  toggleDevTools () {
+    return this.webContents.toggleDevTools()
+  },
+  inspectElement () {
+    return this.webContents.inspectElement.apply(this.webContents, arguments)
+  },
+  inspectServiceWorker () {
+    return this.webContents.inspectServiceWorker()
+  }
+})
 
 module.exports = BrowserWindow

From fd9c9c3be7247c2c96cde057ae27528addc3ed65 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sat, 14 May 2016 12:26:53 -0400
Subject: [PATCH 196/510] :lipstick: Use spread operator instead of arguments
 object

---
 lib/browser/api/browser-window.js | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index 43a8b3203bd7..a2b31184dc6b 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -50,13 +50,13 @@ BrowserWindow.prototype._init = function () {
     if (!event.defaultPrevented) this.setTitle(title)
   })
 
-  // Sometimes the webContents doesn't get focus when window is shown, so we 
-  // have to force focusing on webContents in this case. The safest way is to 
-  // focus it when we first start to load URL, if we do it earlier it won't 
+  // Sometimes the webContents doesn't get focus when window is shown, so we
+  // have to force focusing on webContents in this case. The safest way is to
+  // focus it when we first start to load URL, if we do it earlier it won't
   // have effect, if we do it later we might move focus in the page.
   //
   // Though this hack is only needed on OS X when the app is launched from
-  // Finder, we still do it on all platforms in case of other bugs we don't 
+  // Finder, we still do it on all platforms in case of other bugs we don't
   // know.
   this.webContents.once('load-url', function () {
     this.focus()
@@ -79,7 +79,7 @@ BrowserWindow.prototype._init = function () {
       this.webContents.send('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', isVisible ? 'visible' : 'hidden')
     }
   }
-  
+
   const visibilityEvents = ['show', 'hide', 'minimize', 'maximize', 'restore']
   for (let event of visibilityEvents) {
     this.on(event, visibilityChanged)
@@ -101,6 +101,7 @@ BrowserWindow.getFocusedWindow = () => {
   for (let window of BrowserWindow.getAllWindows()) {
     if (window.isFocused()) return window
   }
+  return null
 }
 
 BrowserWindow.fromWebContents = (webContents) => {
@@ -118,20 +119,20 @@ BrowserWindow.fromDevToolsWebContents = (webContents) => {
 // Helpers.
 
 Object.assign(BrowserWindow.prototype, {
-  loadURL () {
-    return this.webContents.loadURL.apply(this.webContents, arguments)
+  loadURL (...args) {
+    return this.webContents.loadURL.apply(this.webContents, args)
   },
-  getURL () {
+  getURL (...args) {
     return this.webContents.getURL()
   },
-  reload () {
-    return this.webContents.reload.apply(this.webContents, arguments)
+  reload (...args) {
+    return this.webContents.reload.apply(this.webContents, args)
   },
-  send () {
-    return this.webContents.send.apply(this.webContents, arguments)
+  send (...args) {
+    return this.webContents.send.apply(this.webContents, args)
   },
-  openDevTools () {
-    return this.webContents.openDevTools.apply(this.webContents, arguments)
+  openDevTools (...args) {
+    return this.webContents.openDevTools.apply(this.webContents, args)
   },
   closeDevTools () {
     return this.webContents.closeDevTools()
@@ -145,8 +146,8 @@ Object.assign(BrowserWindow.prototype, {
   toggleDevTools () {
     return this.webContents.toggleDevTools()
   },
-  inspectElement () {
-    return this.webContents.inspectElement.apply(this.webContents, arguments)
+  inspectElement (...args) {
+    return this.webContents.inspectElement.apply(this.webContents, args)
   },
   inspectServiceWorker () {
     return this.webContents.inspectServiceWorker()

From 40c531737d1d4a1d0244e0c6305b42847cacd59b Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Fri, 6 May 2016 11:10:31 -0700
Subject: [PATCH 197/510] Add buttonLabel param to showOpen/showSave dialogs

---
 atom/browser/api/atom_api_dialog.cc            | 17 ++++++++++-------
 atom/browser/atom_download_manager_delegate.cc |  3 ++-
 atom/browser/common_web_contents_delegate.cc   |  4 ++--
 atom/browser/ui/file_dialog.h                  |  4 ++++
 atom/browser/ui/file_dialog_gtk.cc             |  4 ++++
 atom/browser/ui/file_dialog_mac.mm             | 16 ++++++++++++----
 atom/browser/ui/file_dialog_win.cc             | 17 ++++++++++++++---
 atom/browser/web_dialog_helper.cc              |  2 ++
 docs/api/dialog.md                             |  1 +
 lib/browser/api/dialog.js                      | 18 ++++++++++++++++--
 10 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/atom/browser/api/atom_api_dialog.cc b/atom/browser/api/atom_api_dialog.cc
index 0a544c56468c..5d853e2d5900 100644
--- a/atom/browser/api/atom_api_dialog.cc
+++ b/atom/browser/api/atom_api_dialog.cc
@@ -67,6 +67,7 @@ void ShowMessageBox(int type,
 }
 
 void ShowOpenDialog(const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const file_dialog::Filters& filters,
                     int properties,
@@ -77,17 +78,18 @@ void ShowOpenDialog(const std::string& title,
   if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(args->isolate(),
                                                                peek,
                                                                &callback)) {
-    file_dialog::ShowOpenDialog(window, title, default_path, filters,
-                                properties, callback);
+    file_dialog::ShowOpenDialog(window, title, button_label, default_path,
+                                filters, properties, callback);
   } else {
     std::vector<base::FilePath> paths;
-    if (file_dialog::ShowOpenDialog(window, title, default_path, filters,
-                                    properties, &paths))
+    if (file_dialog::ShowOpenDialog(window, title, button_label, default_path,
+                                    filters, properties, &paths))
       args->Return(paths);
   }
 }
 
 void ShowSaveDialog(const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const file_dialog::Filters& filters,
                     atom::NativeWindow* window,
@@ -97,11 +99,12 @@ void ShowSaveDialog(const std::string& title,
   if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(args->isolate(),
                                                                peek,
                                                                &callback)) {
-    file_dialog::ShowSaveDialog(window, title, default_path, filters, callback);
+    file_dialog::ShowSaveDialog(window, title, button_label, default_path,
+                                filters, callback);
   } else {
     base::FilePath path;
-    if (file_dialog::ShowSaveDialog(window, title, default_path, filters,
-                                    &path))
+    if (file_dialog::ShowSaveDialog(window, title, button_label, default_path,
+                                    filters, &path))
       args->Return(path);
   }
 }
diff --git a/atom/browser/atom_download_manager_delegate.cc b/atom/browser/atom_download_manager_delegate.cc
index bf09a4059504..05e68993013a 100644
--- a/atom/browser/atom_download_manager_delegate.cc
+++ b/atom/browser/atom_download_manager_delegate.cc
@@ -77,7 +77,8 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
     window = relay->window.get();
 
   base::FilePath path;
-  if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(), default_path,
+  if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(),
+                                  "Save", default_path,
                                   file_dialog::Filters(), &path)) {
     // Remember the last selected download directory.
     AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index da3647bc907e..b36566383bd7 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -389,7 +389,7 @@ void CommonWebContentsDelegate::DevToolsSaveToFile(
   } else {
     file_dialog::Filters filters;
     base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
-    if (!file_dialog::ShowSaveDialog(owner_window(), url, default_path,
+    if (!file_dialog::ShowSaveDialog(owner_window(), url, "Save", default_path,
                                      filters, &path)) {
       base::StringValue url_value(url);
       web_contents_->CallClientFunction(
@@ -455,7 +455,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
     base::FilePath default_path;
     std::vector<base::FilePath> paths;
     int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
-    if (!file_dialog::ShowOpenDialog(owner_window(), "", default_path,
+    if (!file_dialog::ShowOpenDialog(owner_window(), "", "Open", default_path,
                                      filters, flag, &paths))
       return;
 
diff --git a/atom/browser/ui/file_dialog.h b/atom/browser/ui/file_dialog.h
index 51d7f5ee9d32..b857648161b5 100644
--- a/atom/browser/ui/file_dialog.h
+++ b/atom/browser/ui/file_dialog.h
@@ -37,6 +37,7 @@ typedef base::Callback<void(
 
 bool ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -44,6 +45,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
 
 void ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -51,12 +53,14 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
 
 bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     base::FilePath* path);
 
 void ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     const SaveDialogCallback& callback);
diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc
index d4dfcdd1fd05..d58d5b5025c4 100644
--- a/atom/browser/ui/file_dialog_gtk.cc
+++ b/atom/browser/ui/file_dialog_gtk.cc
@@ -216,6 +216,7 @@ base::FilePath FileChooserDialog::AddExtensionForFilename(
 
 bool ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -241,6 +242,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
 
 void ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -259,6 +261,7 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
 
 bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     base::FilePath* path) {
@@ -276,6 +279,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
 
 void ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     const SaveDialogCallback& callback) {
diff --git a/atom/browser/ui/file_dialog_mac.mm b/atom/browser/ui/file_dialog_mac.mm
index 49662c69b3b8..d674817a2a41 100644
--- a/atom/browser/ui/file_dialog_mac.mm
+++ b/atom/browser/ui/file_dialog_mac.mm
@@ -45,11 +45,15 @@ void SetAllowedFileTypes(NSSavePanel* dialog, const Filters& filters) {
 
 void SetupDialog(NSSavePanel* dialog,
                  const std::string& title,
+                 const std::string& button_label,
                  const base::FilePath& default_path,
                  const Filters& filters) {
   if (!title.empty())
     [dialog setTitle:base::SysUTF8ToNSString(title)];
 
+  if (!button_label.empty())
+    [dialog setPrompt:base::SysUTF8ToNSString(button_label)];
+
   NSString* default_dir = nil;
   NSString* default_filename = nil;
   if (!default_path.empty()) {
@@ -114,6 +118,7 @@ void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) {
 
 bool ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -121,7 +126,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
   DCHECK(paths);
   NSOpenPanel* dialog = [NSOpenPanel openPanel];
 
-  SetupDialog(dialog, title, default_path, filters);
+  SetupDialog(dialog, title, button_label, default_path, filters);
   SetupDialogForProperties(dialog, properties);
 
   int chosen = RunModalDialog(dialog, parent_window);
@@ -134,13 +139,14 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
 
 void ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
                     const OpenDialogCallback& c) {
   NSOpenPanel* dialog = [NSOpenPanel openPanel];
 
-  SetupDialog(dialog, title, default_path, filters);
+  SetupDialog(dialog, title, button_label, default_path, filters);
   SetupDialogForProperties(dialog, properties);
 
   // Duplicate the callback object here since c is a reference and gcd would
@@ -162,13 +168,14 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
 
 bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     base::FilePath* path) {
   DCHECK(path);
   NSSavePanel* dialog = [NSSavePanel savePanel];
 
-  SetupDialog(dialog, title, default_path, filters);
+  SetupDialog(dialog, title, button_label, default_path, filters);
 
   int chosen = RunModalDialog(dialog, parent_window);
   if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
@@ -180,12 +187,13 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
 
 void ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     const SaveDialogCallback& c) {
   NSSavePanel* dialog = [NSSavePanel savePanel];
 
-  SetupDialog(dialog, title, default_path, filters);
+  SetupDialog(dialog, title, button_label, default_path, filters);
 
   __block SaveDialogCallback callback = c;
 
diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc
index 6577e4c08404..c5d81c33100b 100644
--- a/atom/browser/ui/file_dialog_win.cc
+++ b/atom/browser/ui/file_dialog_win.cc
@@ -63,7 +63,9 @@ void ConvertFilters(const Filters& filters,
 template <typename T>
 class FileDialog {
  public:
-  FileDialog(const base::FilePath& default_path, const std::string& title,
+  FileDialog(const base::FilePath& default_path,
+             const std::string& title,
+             const std::string& button_label,
              const Filters& filters, int options) {
     std::wstring file_part;
     if (!IsDirectory(default_path))
@@ -79,6 +81,9 @@ class FileDialog {
     if (!title.empty())
       GetPtr()->SetTitle(base::UTF8ToUTF16(title).c_str());
 
+    if (!button_label.empty())
+      GetPtr()->SetOkButtonLabel(base::UTF8ToUTF16(button_label).c_str());
+
     // By default, *.* will be added to the file name if file type is "*.*". In
     // Electron, we disable it to make a better experience.
     //
@@ -154,13 +159,14 @@ bool CreateDialogThread(RunState* run_state) {
 void RunOpenDialogInNewThread(const RunState& run_state,
                               atom::NativeWindow* parent,
                               const std::string& title,
+                              const std::string& button_label,
                               const base::FilePath& default_path,
                               const Filters& filters,
                               int properties,
                               const OpenDialogCallback& callback) {
   std::vector<base::FilePath> paths;
-  bool result = ShowOpenDialog(parent, title, default_path, filters, properties,
-                               &paths);
+  bool result = ShowOpenDialog(parent, title, button_label, default_path,
+                               filters, properties, &paths);
   run_state.ui_message_loop->PostTask(FROM_HERE,
                                       base::Bind(callback, result, paths));
   run_state.ui_message_loop->DeleteSoon(FROM_HERE, run_state.dialog_thread);
@@ -169,6 +175,7 @@ void RunOpenDialogInNewThread(const RunState& run_state,
 void RunSaveDialogInNewThread(const RunState& run_state,
                               atom::NativeWindow* parent,
                               const std::string& title,
+                              const std::string& button_label,
                               const base::FilePath& default_path,
                               const Filters& filters,
                               const SaveDialogCallback& callback) {
@@ -183,6 +190,7 @@ void RunSaveDialogInNewThread(const RunState& run_state,
 
 bool ShowOpenDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -230,6 +238,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
 
 void ShowOpenDialog(atom::NativeWindow* parent,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     int properties,
@@ -248,6 +257,7 @@ void ShowOpenDialog(atom::NativeWindow* parent,
 
 bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     base::FilePath* path) {
@@ -268,6 +278,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
 
 void ShowSaveDialog(atom::NativeWindow* parent,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters,
                     const SaveDialogCallback& callback) {
diff --git a/atom/browser/web_dialog_helper.cc b/atom/browser/web_dialog_helper.cc
index a082c3814c72..be43584a5bc3 100644
--- a/atom/browser/web_dialog_helper.cc
+++ b/atom/browser/web_dialog_helper.cc
@@ -84,6 +84,7 @@ void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
     base::FilePath path;
     if (file_dialog::ShowSaveDialog(window_,
                                     base::UTF16ToUTF8(params.title),
+                                    "Save",
                                     params.default_file_name,
                                     filters,
                                     &path)) {
@@ -114,6 +115,7 @@ void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
         prefs::kSelectFileLastDirectory).Append(params.default_file_name);
     if (file_dialog::ShowOpenDialog(window_,
                                     base::UTF16ToUTF8(params.title),
+                                    "Open",
                                     default_file_path,
                                     filters,
                                     flags,
diff --git a/docs/api/dialog.md b/docs/api/dialog.md
index 1444b5960e81..bb76056d1372 100644
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -28,6 +28,7 @@ The `dialog` module has the following methods:
 * `options` Object
   * `title` String
   * `defaultPath` String
+  * `buttonLabel` String
   * `filters` Array
   * `properties` Array - Contains which features the dialog should use, can
     contain `openFile`, `openDirectory`, `multiSelections` and
diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
index a41d1fa46e0c..55c8935b2ac6 100644
--- a/lib/browser/api/dialog.js
+++ b/lib/browser/api/dialog.js
@@ -75,6 +75,15 @@ module.exports = {
     } else if (typeof options.title !== 'string') {
       throw new TypeError('Title must be a string')
     }
+    if (options.buttonLabel == null) {
+      if (options.properties.indexOf('openDirectory') !== -1) {
+        options.buttonLabel = 'Choose'
+      } else {
+        options.buttonLabel = 'Open'
+      }
+    } else if (typeof options.buttonLabel !== 'string') {
+      throw new TypeError('buttonLabel must be a string')
+    }
     if (options.defaultPath == null) {
       options.defaultPath = ''
     } else if (typeof options.defaultPath !== 'string') {
@@ -86,7 +95,7 @@ module.exports = {
     wrappedCallback = typeof callback === 'function' ? function (success, result) {
       return callback(success ? result : void 0)
     } : null
-    return binding.showOpenDialog(String(options.title), String(options.defaultPath), options.filters, properties, window, wrappedCallback)
+    return binding.showOpenDialog(String(options.title), String(options.buttonLabel), String(options.defaultPath), options.filters, properties, window, wrappedCallback)
   },
 
   showSaveDialog: function (...args) {
@@ -103,6 +112,11 @@ module.exports = {
     } else if (typeof options.title !== 'string') {
       throw new TypeError('Title must be a string')
     }
+    if (options.buttonLabel == null) {
+      options.buttonLabel = 'Save'
+    } else if (typeof options.buttonLabel !== 'string') {
+      throw new TypeError('buttonLabel must be a string')
+    }
     if (options.defaultPath == null) {
       options.defaultPath = ''
     } else if (typeof options.defaultPath !== 'string') {
@@ -114,7 +128,7 @@ module.exports = {
     wrappedCallback = typeof callback === 'function' ? function (success, result) {
       return callback(success ? result : void 0)
     } : null
-    return binding.showSaveDialog(String(options.title), String(options.defaultPath), options.filters, window, wrappedCallback)
+    return binding.showSaveDialog(String(options.title), String(options.buttonLabel), String(options.defaultPath), options.filters, window, wrappedCallback)
   },
 
   showMessageBox: function (...args) {

From 84cce6c2c1af84f83d417e8d2926a8ad3c2d73dd Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Sun, 15 May 2016 01:01:52 -0500
Subject: [PATCH 198/510] Don't default to "Open", "Save", just let OS decide

---
 atom/browser/atom_download_manager_delegate.cc |  2 +-
 atom/browser/common_web_contents_delegate.cc   |  4 ++--
 atom/browser/web_dialog_helper.cc              |  4 ++--
 lib/browser/api/dialog.js                      | 12 ++++--------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/atom/browser/atom_download_manager_delegate.cc b/atom/browser/atom_download_manager_delegate.cc
index 05e68993013a..6d7e3c7172d8 100644
--- a/atom/browser/atom_download_manager_delegate.cc
+++ b/atom/browser/atom_download_manager_delegate.cc
@@ -78,7 +78,7 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
 
   base::FilePath path;
   if (file_dialog::ShowSaveDialog(window, item->GetURL().spec(),
-                                  "Save", default_path,
+                                  "", default_path,
                                   file_dialog::Filters(), &path)) {
     // Remember the last selected download directory.
     AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index b36566383bd7..2093b8f48994 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -389,7 +389,7 @@ void CommonWebContentsDelegate::DevToolsSaveToFile(
   } else {
     file_dialog::Filters filters;
     base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
-    if (!file_dialog::ShowSaveDialog(owner_window(), url, "Save", default_path,
+    if (!file_dialog::ShowSaveDialog(owner_window(), url, "", default_path,
                                      filters, &path)) {
       base::StringValue url_value(url);
       web_contents_->CallClientFunction(
@@ -455,7 +455,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
     base::FilePath default_path;
     std::vector<base::FilePath> paths;
     int flag = file_dialog::FILE_DIALOG_OPEN_DIRECTORY;
-    if (!file_dialog::ShowOpenDialog(owner_window(), "", "Open", default_path,
+    if (!file_dialog::ShowOpenDialog(owner_window(), "", "", default_path,
                                      filters, flag, &paths))
       return;
 
diff --git a/atom/browser/web_dialog_helper.cc b/atom/browser/web_dialog_helper.cc
index be43584a5bc3..2d2a9e5db80d 100644
--- a/atom/browser/web_dialog_helper.cc
+++ b/atom/browser/web_dialog_helper.cc
@@ -84,7 +84,7 @@ void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
     base::FilePath path;
     if (file_dialog::ShowSaveDialog(window_,
                                     base::UTF16ToUTF8(params.title),
-                                    "Save",
+                                    "",
                                     params.default_file_name,
                                     filters,
                                     &path)) {
@@ -115,7 +115,7 @@ void WebDialogHelper::RunFileChooser(content::WebContents* web_contents,
         prefs::kSelectFileLastDirectory).Append(params.default_file_name);
     if (file_dialog::ShowOpenDialog(window_,
                                     base::UTF16ToUTF8(params.title),
-                                    "Open",
+                                    "",
                                     default_file_path,
                                     filters,
                                     flags,
diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
index 55c8935b2ac6..73f53655706c 100644
--- a/lib/browser/api/dialog.js
+++ b/lib/browser/api/dialog.js
@@ -76,11 +76,7 @@ module.exports = {
       throw new TypeError('Title must be a string')
     }
     if (options.buttonLabel == null) {
-      if (options.properties.indexOf('openDirectory') !== -1) {
-        options.buttonLabel = 'Choose'
-      } else {
-        options.buttonLabel = 'Open'
-      }
+      options.buttonLabel = ''
     } else if (typeof options.buttonLabel !== 'string') {
       throw new TypeError('buttonLabel must be a string')
     }
@@ -95,7 +91,7 @@ module.exports = {
     wrappedCallback = typeof callback === 'function' ? function (success, result) {
       return callback(success ? result : void 0)
     } : null
-    return binding.showOpenDialog(String(options.title), String(options.buttonLabel), String(options.defaultPath), options.filters, properties, window, wrappedCallback)
+    return binding.showOpenDialog(options.title, options.buttonLabel, options.defaultPath, options.filters, properties, window, wrappedCallback)
   },
 
   showSaveDialog: function (...args) {
@@ -113,7 +109,7 @@ module.exports = {
       throw new TypeError('Title must be a string')
     }
     if (options.buttonLabel == null) {
-      options.buttonLabel = 'Save'
+      options.buttonLabel = ''
     } else if (typeof options.buttonLabel !== 'string') {
       throw new TypeError('buttonLabel must be a string')
     }
@@ -128,7 +124,7 @@ module.exports = {
     wrappedCallback = typeof callback === 'function' ? function (success, result) {
       return callback(success ? result : void 0)
     } : null
-    return binding.showSaveDialog(String(options.title), String(options.buttonLabel), String(options.defaultPath), options.filters, window, wrappedCallback)
+    return binding.showSaveDialog(options.title, options.buttonLabel, options.defaultPath, options.filters, window, wrappedCallback)
   },
 
   showMessageBox: function (...args) {

From 6217d497edfe9f691888db8b4fcc296882218800 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Sun, 15 May 2016 01:02:27 -0500
Subject: [PATCH 199/510] Fix build issues

---
 atom/browser/ui/file_dialog_gtk.cc | 18 +++++++++++-------
 atom/browser/ui/file_dialog_win.cc |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc
index d58d5b5025c4..713b7b3ddb72 100644
--- a/atom/browser/ui/file_dialog_gtk.cc
+++ b/atom/browser/ui/file_dialog_gtk.cc
@@ -37,12 +37,16 @@ class FileChooserDialog {
   FileChooserDialog(GtkFileChooserAction action,
                     atom::NativeWindow* parent_window,
                     const std::string& title,
+                    const std::string& button_label,
                     const base::FilePath& default_path,
                     const Filters& filters)
       : dialog_scope_(parent_window),
         filters_(filters) {
     const char* confirm_text = GTK_STOCK_OK;
-    if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+
+    if (button_label != NULL)
+      confirm_text = button_label.c_str();
+    else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
       confirm_text = GTK_STOCK_SAVE;
     else if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
       confirm_text = GTK_STOCK_OPEN;
@@ -224,8 +228,8 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
   GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
   if (properties & FILE_DIALOG_OPEN_DIRECTORY)
     action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
-  FileChooserDialog open_dialog(action, parent_window, title, default_path,
-                                filters);
+  FileChooserDialog open_dialog(action, parent_window, title, button_label,
+                                default_path, filters);
   if (properties & FILE_DIALOG_MULTI_SELECTIONS)
     gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(open_dialog.dialog()),
                                          TRUE);
@@ -251,7 +255,7 @@ void ShowOpenDialog(atom::NativeWindow* parent_window,
   if (properties & FILE_DIALOG_OPEN_DIRECTORY)
     action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
   FileChooserDialog* open_dialog = new FileChooserDialog(
-      action, parent_window, title, default_path, filters);
+      action, parent_window, title, button_label, default_path, filters);
   if (properties & FILE_DIALOG_MULTI_SELECTIONS)
     gtk_file_chooser_set_select_multiple(
         GTK_FILE_CHOOSER(open_dialog->dialog()), TRUE);
@@ -266,7 +270,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const Filters& filters,
                     base::FilePath* path) {
   FileChooserDialog save_dialog(GTK_FILE_CHOOSER_ACTION_SAVE, parent_window,
-                                title, default_path, filters);
+                                title, button_label, default_path, filters);
   gtk_widget_show_all(save_dialog.dialog());
   int response = gtk_dialog_run(GTK_DIALOG(save_dialog.dialog()));
   if (response == GTK_RESPONSE_ACCEPT) {
@@ -284,8 +288,8 @@ void ShowSaveDialog(atom::NativeWindow* parent_window,
                     const Filters& filters,
                     const SaveDialogCallback& callback) {
   FileChooserDialog* save_dialog = new FileChooserDialog(
-      GTK_FILE_CHOOSER_ACTION_SAVE, parent_window, title, default_path,
-      filters);
+      GTK_FILE_CHOOSER_ACTION_SAVE, parent_window, title, button_label,
+      default_path, filters);
   save_dialog->RunSaveAsynchronous(callback);
 }
 
diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc
index c5d81c33100b..e99dcee35c50 100644
--- a/atom/browser/ui/file_dialog_win.cc
+++ b/atom/browser/ui/file_dialog_win.cc
@@ -180,7 +180,8 @@ void RunSaveDialogInNewThread(const RunState& run_state,
                               const Filters& filters,
                               const SaveDialogCallback& callback) {
   base::FilePath path;
-  bool result = ShowSaveDialog(parent, title, default_path, filters, &path);
+  bool result = ShowSaveDialog(parent, title, button_label, default_path,
+                               filters, &path);
   run_state.ui_message_loop->PostTask(FROM_HERE,
                                       base::Bind(callback, result, path));
   run_state.ui_message_loop->DeleteSoon(FROM_HERE, run_state.dialog_thread);

From 54c654530e17062454d7d660e91e5a9f5c954c4d Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Sun, 15 May 2016 01:29:13 -0500
Subject: [PATCH 200/510] Fix linux support

---
 atom/browser/ui/file_dialog_gtk.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc
index 713b7b3ddb72..2c8b785544a2 100644
--- a/atom/browser/ui/file_dialog_gtk.cc
+++ b/atom/browser/ui/file_dialog_gtk.cc
@@ -44,7 +44,7 @@ class FileChooserDialog {
         filters_(filters) {
     const char* confirm_text = GTK_STOCK_OK;
 
-    if (button_label != NULL)
+    if (!button_label.empty())
       confirm_text = button_label.c_str();
     else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
       confirm_text = GTK_STOCK_SAVE;

From 16c870191f7664e93ca445ac4071f71c9b48c460 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Sun, 15 May 2016 15:42:35 +0900
Subject: [PATCH 201/510] Update: Japanese version of MAS submission-guide

---
 docs-translations/jp/README.md                | 28 +++++++----
 .../mac-app-store-submission-guide.md         | 50 ++++++++++++-------
 docs-translations/jp/tutorial/security.md     |  1 -
 3 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/docs-translations/jp/README.md b/docs-translations/jp/README.md
index 63abb646efc7..87958a5346ad 100644
--- a/docs-translations/jp/README.md
+++ b/docs-translations/jp/README.md
@@ -16,6 +16,7 @@ _リンクになっていないリストは未翻訳のものです。_
 * [セキュリティ](tutorial/security.md)
 * [アプリケーションの配布](tutorial/application-distribution.md)
 * [Mac App Store 提出ガイド](tutorial/mac-app-store-submission-guide.md)
+* Windows Store Guide (tutorial/windows-store-guide.md)
 * [アプリケーションのパッケージ化](tutorial/application-packaging.md)
 * [ネイティブのNodeモジュールを使用する](tutorial/using-native-node-modules.md)
 * [メインプロセスのデバッグ](tutorial/debugging-main-process.md)
@@ -23,6 +24,8 @@ _リンクになっていないリストは未翻訳のものです。_
 * [DevTools エクステンション](tutorial/devtools-extension.md)
 * [Pepper Flashプラグインを使用する](tutorial/using-pepper-flash-plugin.md)
 * [Widevine CDMプラグインを使用する](tutorial/using-widevine-cdm-plugin.md)
+* Testing on Headless CI Systems (Travis, Jenkins) (tutorial/testing-on-headless-ci.md)
+
 
 # チュートリアル
 
@@ -40,14 +43,14 @@ _リンクになっていないリストは未翻訳のものです。_
 ### カスタムDOM要素:
 
 * [`File` Object](api/file-object.md)
-* `<webview>` Tag
+* `<webview>` Tag api/web-view-tag.md
 * [`window.open` 関数](api/window-open.md)
 
 ### Main Processのモジュール:
 
 * [app](api/app.md)
 * [autoUpdater](api/auto-updater.md)
-* BrowserWindow
+* BrowserWindow (api/browser-window.md)
     * [フレームの無いウィンドウ](api/frameless-window.md)
 * [contentTracing](api/content-tracing.md)
 * [dialog](api/dialog.md)
@@ -59,7 +62,8 @@ _リンクになっていないリストは未翻訳のものです。_
 * [powerSaveBlocker](api/power-save-blocker.md)
 * [protocol](api/protocol.md)
 * [session](api/session.md)
-* webContents
+* systemPreferences (api/system-preferences.md)
+* webContents (api/web-contents.md)
 * [Tray](api/tray.md)
 
 ### Renderer Processのモジュール (Web Page):
@@ -79,11 +83,13 @@ _リンクになっていないリストは未翻訳のものです。_
 
 ## 開発
 
-* Coding Style
-* Source Code Directory Structure
-* Technical Differences to NW.js (formerly node-webkit)
-* Build System Overview
-* Build Instructions (OS X)
-* Build Instructions (Windows)
-* Build Instructions (Linux)
-* Setting Up Symbol Server in debugger
+
+* Coding Style (development/coding-style.md)
+* Source Code Directory Structure (development/source-code-directory-structure.md)
+* Technical Differences to NW.js  (formerly node-webkit)(development/atom-shell-vs-node-webkit.md)
+* Build System Overview (development/build-system-overview.md)
+* Build Instructions (OS X) (development/build-instructions-osx.md)
+* Build Instructions (Windows) (development/build-instructions-windows.md)
+* Build Instructions (Linux) (development/build-instructions-linux.md)
+* Debug Instructions (Windows) (development/debug-instructions-windows.md)
+* Setting Up Symbol Server in debugger (development/setting-up-symbol-server.md)
diff --git a/docs-translations/jp/tutorial/mac-app-store-submission-guide.md b/docs-translations/jp/tutorial/mac-app-store-submission-guide.md
index c4bbf0706eba..3360d0c47b17 100644
--- a/docs-translations/jp/tutorial/mac-app-store-submission-guide.md
+++ b/docs-translations/jp/tutorial/mac-app-store-submission-guide.md
@@ -2,13 +2,11 @@
 
 v0.34.0から、ElectronはMac App Store (MAS)にパッケージ化したアプリを登録することができます。このガイドでは、MASビルド用の制限とアプリを登録する方法についての情報を提供します。
 
-__Note:__ v0.36.0から、アプリがサンドボックス化された後GPUプロセスを妨害するバグがあるので、このバグが修正されるまでは、v0.35.xを使用することを推奨します。[issue #3871][issue-3871]で、このことに関する追加情報を確認できます。
-
 __Note:__ Mac App Storeにアプリを登録するには、費用が発生する[Apple Developer Program][developer-program]に登録する必要があります。
 
 ## アプリを登録する方法
 
-次の手順は、Mac App Sotreにアプリを登録する簡単な手順を説明します。しかし、これらの手順はAppleによってAppが承認されることを保証するものではありません。Mac App Storeの要件については、Appleの[Submitting Your App][submitting-your-app]ガイドを読んでおく必要があります。
+次の手順は、Mac App Storeにアプリを登録する簡単な手順を説明します。しかし、これらの手順はAppleによってAppが承認されることを保証するものではありません。Mac App Storeの要件については、Appleの[Submitting Your App][submitting-your-app]ガイドを読んでおく必要があります。
 
 ### 証明書の取得
 
@@ -44,11 +42,13 @@ Appleから証明書を取得した後、[Application Distribution](application-
   <dict>
     <key>com.apple.security.app-sandbox</key>
     <true/>
+	<key>com.apple.security.temporary-exception.sbpl</key>
+	<string>(allow mach-lookup (global-name-regex #"^org.chromium.Chromium.rohitfork.[0-9]+$"))</string>
   </dict>
 </plist>
 ```
 
-次のスクリプトでアプリをサインします。
+次のスクリプトでアプリを署名します。
 
 ```bash
 #!/bin/bash
@@ -65,26 +65,37 @@ INSTALLER_KEY="3rd Party Mac Developer Installer: Company Name (APPIDENTITY)"
 
 FRAMEWORKS_PATH="$APP_PATH/Contents/Frameworks"
 
-codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A"
-codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/"
-codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/"
-codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/"
-if [ -d "$FRAMEWORKS_PATH/Squirrel.framework/Versions/A" ]; then
-  # Signing a non-MAS build.
-  codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Mantle.framework/Versions/A"
-  codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/ReactiveCocoa.framework/Versions/A"
-  codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Squirrel.framework/Versions/A"
-fi
-codesign -fs "$APP_KEY" --entitlements parent.plist "$APP_PATH"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Electron Framework"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libnode.dylib"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/Contents/MacOS/$APP Helper"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/Contents/MacOS/$APP Helper EH"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/Contents/MacOS/$APP Helper NP"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/"
+codesign -s "$APP_KEY" -f --entitlements child.plist "$APP_PATH/Contents/MacOS/$APP"
+codesign -s "$APP_KEY" -f --entitlements parent.plist "$APP_PATH"
 
 productbuild --component "$APP_PATH" /Applications --sign "$INSTALLER_KEY" "$RESULT_PATH"
 ```
 
-OS Xで、サンドボックスにアプリを新しく追加した場合、基本的な考え方は、Appleの[Enabling App Sandbox][enable-app-sandbox]を読み、エンタイトルメントファイルにアプリに必要なパーミッションキーを追加します。
+OS Xでのアプリのサンドボックス化を行うことが初めてなら、Appleの[Enabling App Sandbox][enable-app-sandbox]を通読し、基本的な考え方を確認してから、、エンタイトルメントファイルにアプリに必要なパーミッションキーを追加します。
 
-### Appをアップロードし、レビューに登録する
+### Appをアップロードする。
 
-アプリに署名後、iTunes ConnectにアップロードするためにApplication Loaderを使用できます。アップロードする前に[created a record][create-record]を確認してください。そして[レビュー用にアプリを登録できます][submit-for-review].
+アプリに署名後、iTunes ConnectにアップロードするためにApplication Loaderを使用できます。アップロードする前に[created a record][create-record]を確認してください。
+
+### `temporary-exception`の使用について
+
+アプリのサンドボックス化を行った場合、[App Sandbox Temporary Exception Entitlements][temporary-exception]にしたがって、`temporary-exception｀がエンタイトルメントに追加されます。そのため、なぜこのエントリが必要かを説明する必要があります。
+
+アウリケーションがChromiumブラウザに基づいて作られていることを説明する必要があるでしょうが、それでもこの事のためにAppleの審査から落ちる可能性は残っています。
+
+### アプリケーションを審査に提出
+
+これらのステップを終えた後、[レビュー用にアプリを登録できます][submit-for-review].
 
 ## MAS Buildの制限
 
@@ -131,7 +142,7 @@ Electron は次の暗号アルゴリズムを使用しています:
 * RC5 - http://people.csail.mit.edu/rivest/Rivest-rc5rev.pdf
 * RIPEMD - [ISO/IEC 10118-3](http://webstore.ansi.org/RecordDetail.aspx?sku=ISO%2FIEC%2010118-3:2004)
 
-ERNの同意を取得するには、 [How to legally submit an app to Apple’s App Store when it uses encryption (or how to obtain an ERN)][ern-tutorial]を参照してくだｓだい。
+ERNの同意を取得するには、 [How to legally submit an app to Apple's App Store when it uses encryption (or how to obtain an ERN)][ern-tutorial]を参照してください。
 
 [developer-program]: https://developer.apple.com/support/compare-memberships/
 [submitting-your-app]: https://developer.apple.com/library/mac/documentation/IDEs/Conceptual/AppDistributionGuide/SubmittingYourApp/SubmittingYourApp.html
@@ -142,3 +153,4 @@ ERNの同意を取得するには、 [How to legally submit an app to Apple’s
 [app-sandboxing]: https://developer.apple.com/app-sandboxing/
 [issue-3871]: https://github.com/electron/electron/issues/3871
 [ern-tutorial]: https://carouselapps.com/2015/12/15/legally-submit-app-apples-app-store-uses-encryption-obtain-ern/
+[temporary-exception]: https://developer.apple.com/library/mac/documentation/Miscellaneous/Reference/EntitlementKeyReference/Chapters/AppSandboxTemporaryExceptionEntitlements.html
diff --git a/docs-translations/jp/tutorial/security.md b/docs-translations/jp/tutorial/security.md
index f1ab7a9278d1..57c47e4de734 100644
--- a/docs-translations/jp/tutorial/security.md
+++ b/docs-translations/jp/tutorial/security.md
@@ -30,7 +30,6 @@ Electronは新しいバージョンのChromiumを出来るだけ早くサポー
 * セキュア(https)な内容のみを表示してください。
 * リモートの内容を表示する全てのレンダラでNode integrationを無効にしてください (`webPreferences`を使用)
 * `webSecurity`を無効にしないください。無効にすると、same-origin policyが無効になります。
-* 
 * [`Content-Security-Policy`](http://www.html5rocks.com/en/tutorials/security/content-security-policy/)を定義して、スクリプトの読み込み元を制限してください。(例: `script-src 'self'`)
 * [`eval`を無効にしてください。](https://github.com/nylas/N1/blob/0abc5d5defcdb057120d726b271933425b75b415/static/index.js#L6) evalは文字列をコードとして実行してしまいます。
 * `allowDisplayingInsecureContent` を有効にしないでください。

From 2317b56ac4c698eb879553e75f20e363f6459293 Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sun, 15 May 2016 09:36:13 -0400
Subject: [PATCH 202/510] :lipstick: Make the power-save-blocker a bit more
 concise

---
 lib/browser/api/power-save-blocker.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/browser/api/power-save-blocker.js b/lib/browser/api/power-save-blocker.js
index bbcc7e2cdabf..3e3c21fb62ec 100644
--- a/lib/browser/api/power-save-blocker.js
+++ b/lib/browser/api/power-save-blocker.js
@@ -1,5 +1 @@
-var powerSaveBlocker
-
-powerSaveBlocker = process.atomBinding('power_save_blocker').powerSaveBlocker
-
-module.exports = powerSaveBlocker
+module.exports = process.atomBinding('power_save_blocker').powerSaveBlocker

From 0d3d097ce82a4c75b2d3ab7cad41707ea13759de Mon Sep 17 00:00:00 2001
From: Steve Kinney <hello@stevekinney.net>
Date: Sun, 15 May 2016 09:41:30 -0400
Subject: [PATCH 203/510] :lipstick: Standarize requires in JavaScript API

---
 lib/browser/api/dialog.js                | 3 +--
 lib/browser/api/navigation-controller.js | 2 +-
 lib/browser/api/power-monitor.js         | 4 ++--
 lib/browser/api/screen.js                | 4 ++--
 lib/browser/api/tray.js                  | 4 ++--
 lib/browser/api/web-contents.js          | 6 ++----
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/browser/api/dialog.js b/lib/browser/api/dialog.js
index a41d1fa46e0c..49425c44968a 100644
--- a/lib/browser/api/dialog.js
+++ b/lib/browser/api/dialog.js
@@ -1,7 +1,6 @@
 'use strict'
 
-const app = require('electron').app
-const BrowserWindow = require('electron').BrowserWindow
+const {app, BrowserWindow} = require('electron')
 const binding = process.atomBinding('dialog')
 const v8Util = process.atomBinding('v8_util')
 
diff --git a/lib/browser/api/navigation-controller.js b/lib/browser/api/navigation-controller.js
index c7aa7f4e92aa..1260cfb3dac7 100644
--- a/lib/browser/api/navigation-controller.js
+++ b/lib/browser/api/navigation-controller.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const ipcMain = require('electron').ipcMain
+const {ipcMain} = require('electron')
 
 // The history operation in renderer is redirected to browser.
 ipcMain.on('ELECTRON_NAVIGATION_CONTROLLER', function (event, method, ...args) {
diff --git a/lib/browser/api/power-monitor.js b/lib/browser/api/power-monitor.js
index 02afeb5ba111..87c0069da3b6 100644
--- a/lib/browser/api/power-monitor.js
+++ b/lib/browser/api/power-monitor.js
@@ -1,5 +1,5 @@
-const EventEmitter = require('events').EventEmitter
-const powerMonitor = process.atomBinding('power_monitor').powerMonitor
+const {EventEmitter} = require('events')
+const {powerMonitor} = process.atomBinding('power_monitor')
 
 Object.setPrototypeOf(powerMonitor, EventEmitter.prototype)
 
diff --git a/lib/browser/api/screen.js b/lib/browser/api/screen.js
index 9326ace2c4f1..25e3c37d3d54 100644
--- a/lib/browser/api/screen.js
+++ b/lib/browser/api/screen.js
@@ -1,5 +1,5 @@
-const EventEmitter = require('events').EventEmitter
-const screen = process.atomBinding('screen').screen
+const {EventEmitter} = require('events')
+const {screen} = process.atomBinding('screen')
 
 Object.setPrototypeOf(screen, EventEmitter.prototype)
 
diff --git a/lib/browser/api/tray.js b/lib/browser/api/tray.js
index 729e430ee3fd..2afdb3643146 100644
--- a/lib/browser/api/tray.js
+++ b/lib/browser/api/tray.js
@@ -1,5 +1,5 @@
-const EventEmitter = require('events').EventEmitter
-const Tray = process.atomBinding('tray').Tray
+const {EventEmitter} = require('events')
+const {Tray} = process.atomBinding('tray')
 
 Object.setPrototypeOf(Tray.prototype, EventEmitter.prototype)
 
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index c706954b64bd..a1d00e7cd9cf 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -1,9 +1,7 @@
 'use strict'
 
-const EventEmitter = require('events').EventEmitter
-const ipcMain = require('electron').ipcMain
-const NavigationController = require('electron').NavigationController
-const Menu = require('electron').Menu
+const {EventEmitter} = require('events')
+const {ipcMain, Menu, NavigationController} = require('electron')
 
 const binding = process.atomBinding('web_contents')
 const debuggerBinding = process.atomBinding('debugger')

From e53bfad01842429acf37439a935bf4d7622f6417 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 16 May 2016 10:09:41 +0900
Subject: [PATCH 204/510] Fix building on Windows

---
 atom/browser/ui/file_dialog_win.cc | 8 ++++----
 docs/api/dialog.md                 | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc
index e99dcee35c50..af699a103937 100644
--- a/atom/browser/ui/file_dialog_win.cc
+++ b/atom/browser/ui/file_dialog_win.cc
@@ -203,7 +203,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
     options |= FOS_ALLOWMULTISELECT;
 
   FileDialog<CShellFileOpenDialog> open_dialog(
-      default_path, title, filters, options);
+      default_path, title, button_label, filters, options);
   if (!open_dialog.Show(parent_window))
     return false;
 
@@ -253,7 +253,7 @@ void ShowOpenDialog(atom::NativeWindow* parent,
   run_state.dialog_thread->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&RunOpenDialogInNewThread, run_state, parent, title,
-                 default_path, filters, properties, callback));
+                 button_label, default_path, filters, properties, callback));
 }
 
 bool ShowSaveDialog(atom::NativeWindow* parent_window,
@@ -263,7 +263,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
                     const Filters& filters,
                     base::FilePath* path) {
   FileDialog<CShellFileSaveDialog> save_dialog(
-      default_path, title, filters,
+      default_path, title, button_label, filters,
       FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST | FOS_OVERWRITEPROMPT);
   if (!save_dialog.Show(parent_window))
     return false;
@@ -292,7 +292,7 @@ void ShowSaveDialog(atom::NativeWindow* parent,
   run_state.dialog_thread->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&RunSaveDialogInNewThread, run_state, parent, title,
-                 default_path, filters, callback));
+                 button_label, default_path, filters, callback));
 }
 
 }  // namespace file_dialog
diff --git a/docs/api/dialog.md b/docs/api/dialog.md
index bb76056d1372..3681a66d7bf6 100644
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -28,7 +28,8 @@ The `dialog` module has the following methods:
 * `options` Object
   * `title` String
   * `defaultPath` String
-  * `buttonLabel` String
+  * `buttonLabel` String - Custom label for the confirmation button, when
+    left empty the default label will be used.
   * `filters` Array
   * `properties` Array - Contains which features the dialog should use, can
     contain `openFile`, `openDirectory`, `multiSelections` and
@@ -70,6 +71,8 @@ shown.
 * `options` Object
   * `title` String
   * `defaultPath` String
+  * `buttonLabel` String - Custom label for the confirmation button, when
+    left empty the default label will be used.
   * `filters` Array
 * `callback` Function (optional)
 

From f53aabaef57ab29f28a9ee7ce8eae76f1b7bd278 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 15:48:14 +0900
Subject: [PATCH 205/510] Implement titleBarStyle without using
 NSFullSizeContentViewWindowMask

---
 atom/browser/native_window.cc     |  3 +--
 atom/browser/native_window.h      | 12 ++----------
 atom/browser/native_window_mac.h  |  4 ++++
 atom/browser/native_window_mac.mm | 25 ++++++++++++-------------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index a5abc56f898c..0d5c26c560d1 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -49,7 +49,6 @@ NativeWindow::NativeWindow(
     const mate::Dictionary& options)
     : content::WebContentsObserver(inspectable_web_contents->GetWebContents()),
       has_frame_(true),
-      force_using_draggable_region_(false),
       transparent_(false),
       enable_larger_than_screen_(false),
       is_closed_(false),
@@ -573,7 +572,7 @@ bool NativeWindow::OnMessageReceived(const IPC::Message& message) {
 void NativeWindow::UpdateDraggableRegions(
     const std::vector<DraggableRegion>& regions) {
   // Draggable region is not supported for non-frameless window.
-  if (has_frame_ && !force_using_draggable_region_)
+  if (has_frame_)
     return;
   draggable_region_ = DraggableRegionsToSkRegion(regions);
 }
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index f3acf6222314..7317a7ba6f76 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -246,18 +246,13 @@ class NativeWindow : public base::SupportsUserData,
   }
 
   bool has_frame() const { return has_frame_; }
+  void set_has_frame(bool has_frame) { has_frame_ = has_frame; }
+
   bool transparent() const { return transparent_; }
   SkRegion* draggable_region() const { return draggable_region_.get(); }
   bool enable_larger_than_screen() const { return enable_larger_than_screen_; }
   gfx::ImageSkia icon() const { return icon_; }
 
-  bool force_using_draggable_region() const {
-    return force_using_draggable_region_;
-  }
-  void set_force_using_draggable_region(bool force) {
-    force_using_draggable_region_ = true;
-  }
-
   void set_has_dialog_attached(bool has_dialog_attached) {
     has_dialog_attached_ = has_dialog_attached;
   }
@@ -299,9 +294,6 @@ class NativeWindow : public base::SupportsUserData,
   // Whether window has standard frame.
   bool has_frame_;
 
-  // Force the window to be aware of draggable regions.
-  bool force_using_draggable_region_;
-
   // Whether window is transparent.
   bool transparent_;
 
diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index 93d03e4c157c..5ad4f39e722f 100644
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -142,6 +142,10 @@ class NativeWindowMac : public NativeWindow {
   // The presentation options before entering kiosk mode.
   NSApplicationPresentationOptions kiosk_options_;
 
+  // Force showing the buttons for frameless window.
+  bool force_show_buttons_;
+
+  // Whether to hide the native toolbar under fullscreen mode.
   bool should_hide_native_toolbar_in_fullscreen_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWindowMac);
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 04569d8f50f9..4a646a9eb931 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -391,6 +391,7 @@ NativeWindowMac::NativeWindowMac(
     : NativeWindow(web_contents, options),
       is_kiosk_(false),
       attention_request_id_(0),
+      force_show_buttons_(false),
       should_hide_native_toolbar_in_fullscreen_(false) {
   int width = 800, height = 600;
   options.Get(options::kWidth, &width);
@@ -438,22 +439,17 @@ NativeWindowMac::NativeWindowMac(
   if (closable) {
     styleMask |= NSClosableWindowMask;
   }
+  if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
+    // The window without titlebar is treated the same with frameless window.
+    set_has_frame(false);
+    force_show_buttons_ = true;
+  }
   if (!useStandardWindow || transparent() || !has_frame()) {
     styleMask |= NSTexturedBackgroundWindowMask;
   }
   if (resizable) {
     styleMask |= NSResizableWindowMask;
   }
-  if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
-    styleMask |= NSFullSizeContentViewWindowMask;
-    styleMask |= NSUnifiedTitleAndToolbarWindowMask;
-  }
-  // We capture this because we need to access the option later when
-  // entering/exiting fullscreen and since the options dict is only passed to
-  // the constructor but not stored, let’s store this option this way.
-  if (titleBarStyle == "hidden-inset") {
-    should_hide_native_toolbar_in_fullscreen_ = true;
-  }
 
   window_.reset([[AtomNSWindow alloc]
       initWithContentRect:cocoa_bounds
@@ -498,9 +494,8 @@ NativeWindowMac::NativeWindowMac(
           [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
       [toolbar setShowsBaselineSeparator:NO];
       [window_ setToolbar:toolbar];
+      should_hide_native_toolbar_in_fullscreen_ = true;
     }
-    // We should be aware of draggable regions when using hidden titlebar.
-    set_force_using_draggable_region(true);
   }
 
   // On OS X the initial window size doesn't include window frame.
@@ -1013,6 +1008,10 @@ void NativeWindowMac::InstallView() {
     [view setFrame:[content_view_ bounds]];
     [content_view_ addSubview:view];
 
+    if (force_show_buttons_)
+      return;
+
+    // Hide the window buttons.
     [[window_ standardWindowButton:NSWindowZoomButton] setHidden:YES];
     [[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
     [[window_ standardWindowButton:NSWindowCloseButton] setHidden:YES];
@@ -1031,7 +1030,7 @@ void NativeWindowMac::UninstallView() {
 
 void NativeWindowMac::UpdateDraggableRegionViews(
     const std::vector<DraggableRegion>& regions) {
-  if (has_frame() && !force_using_draggable_region())
+  if (has_frame())
     return;
 
   // All ControlRegionViews should be added as children of the WebContentsView,

From 13bfb099a2d23c302d43e26829a8fbf7a571dc2d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 16:19:28 +0900
Subject: [PATCH 206/510] Fix the toolbar showing when titleBarStyle is
 hidden-inset

---
 atom/browser/native_window_mac.h  |  8 ++++----
 atom/browser/native_window_mac.mm | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index 5ad4f39e722f..22390f42dd0e 100644
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -91,6 +91,10 @@ class NativeWindowMac : public NativeWindow {
     UpdateDraggableRegionViews(draggable_regions_);
   }
 
+  // Set the attribute of NSWindow while work around a bug of zoom button.
+  void SetStyleMask(bool on, NSUInteger flag);
+  void SetCollectionBehavior(bool on, NSUInteger flag);
+
   bool should_hide_native_toolbar_in_fullscreen() const {
     return should_hide_native_toolbar_in_fullscreen_;
   }
@@ -120,10 +124,6 @@ class NativeWindowMac : public NativeWindow {
   // whehter we can drag.
   void UpdateDraggableRegionViews(const std::vector<DraggableRegion>& regions);
 
-  // Set the attribute of NSWindow while work around a bug of zo0m button.
-  void SetStyleMask(bool on, NSUInteger flag);
-  void SetCollectionBehavior(bool on, NSUInteger flag);
-
   base::scoped_nsobject<AtomNSWindow> window_;
   base::scoped_nsobject<AtomNSWindowDelegate> window_delegate_;
 
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 4a646a9eb931..0f782d58516b 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -214,10 +214,22 @@ bool ScopedDisableResize::disable_resize_ = false;
         [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
     [toolbar setShowsBaselineSeparator:NO];
     [window setToolbar:toolbar];
+
+    // Set window style to hide the toolbar, otherwise the toolbar will show in
+    // fullscreen mode.
+    shell_->SetStyleMask(true, NSFullSizeContentViewWindowMask);
   }
 }
 
+- (void)windowWillExitFullScreen:(NSNotification*)notification {
+  // Turn off the style for toolbar.
+  if (shell_->should_hide_native_toolbar_in_fullscreen())
+    shell_->SetStyleMask(false, NSFullSizeContentViewWindowMask);
+}
+
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
+  // For certain versions of OS X the fullscreen button will automatically show
+  // after exiting fullscreen mode.
   if (!shell_->has_frame()) {
     NSWindow* window = shell_->GetNativeWindow();
     [[window standardWindowButton:NSWindowFullScreenButton] setHidden:YES];
@@ -486,7 +498,7 @@ NativeWindowMac::NativeWindowMac(
   [window_ setReleasedWhenClosed:NO];
 
   // Hide the title bar.
-  if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
+  if (titleBarStyle == "hidden-inset") {
     [window_ setTitlebarAppearsTransparent:YES];
     [window_ setTitleVisibility:NSWindowTitleHidden];
     if (titleBarStyle == "hidden-inset") {

From c1399f9bdcd01a0095f586a93a8b662e32ede896 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 16:51:06 +0900
Subject: [PATCH 207/510] Disable webview when nodeIntegration is off

---
 lib/renderer/init.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index fadf95256865..bff4ea746ca3 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -70,7 +70,7 @@ if (window.location.protocol === 'chrome-devtools:') {
   require('./override')
 
   // Load webview tag implementation.
-  if (process.guestInstanceId == null) {
+  if (nodeIntegration === 'true' && process.guestInstanceId == null) {
     require('./web-view/web-view')
     require('./web-view/web-view-attributes')
   }

From 014001550043ceef6ea815825325f8432add6c58 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 17:04:13 +0900
Subject: [PATCH 208/510] spec: WebView is disabled when nodeIntegration is
 disabled

---
 spec/fixtures/module/preload-webview.js |  5 +++++
 spec/webview-spec.js                    | 27 +++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 spec/fixtures/module/preload-webview.js

diff --git a/spec/fixtures/module/preload-webview.js b/spec/fixtures/module/preload-webview.js
new file mode 100644
index 000000000000..273065cdaacd
--- /dev/null
+++ b/spec/fixtures/module/preload-webview.js
@@ -0,0 +1,5 @@
+const {ipcRenderer} = require('electron')
+
+window.onload = function () {
+  ipcRenderer.send('webview', typeof WebView)
+}
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index e8a82a15ed39..aca18a2de6c3 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -8,7 +8,9 @@ describe('<webview> tag', function () {
   this.timeout(20000)
 
   var fixtures = path.join(__dirname, 'fixtures')
+
   var webview = null
+  let w = null
 
   beforeEach(function () {
     webview = new WebView()
@@ -18,17 +20,38 @@ describe('<webview> tag', function () {
     if (document.body.contains(webview)) {
       document.body.removeChild(webview)
     }
+    if (w) {
+      w.destroy()
+      w = null
+    }
   })
 
   it('works without script tag in page', function (done) {
-    let w = new BrowserWindow({show: false})
+    w = new BrowserWindow({show: false})
     ipcMain.once('pong', function () {
-      w.destroy()
       done()
     })
     w.loadURL('file://' + fixtures + '/pages/webview-no-script.html')
   })
 
+  it('is disabled when nodeIntegration is disabled', function (done) {
+    w = new BrowserWindow({
+      show: false,
+      webPreferences: {
+        nodeIntegration: false,
+        preload: path.join(fixtures, 'module', 'preload-webview.js')
+      },
+    })
+    ipcMain.once('webview', function (event, type) {
+      if (type === 'undefined') {
+        done()
+      } else {
+        done('WebView still exists')
+      }
+    })
+    w.loadURL('file://' + fixtures + '/pages/webview-no-script.html')
+  })
+
   describe('src attribute', function () {
     it('specifies the page to load', function (done) {
       webview.addEventListener('console-message', function (e) {

From 90f52169af155fad78aa370f12aee57fad5a7db2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 17:06:02 +0900
Subject: [PATCH 209/510] No more need to check for nodeIntegration when
 creating guest view

---
 lib/browser/guest-view-manager.js |  4 ----
 spec/webview-spec.js              | 34 -------------------------------
 2 files changed, 38 deletions(-)

diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 58775669c2f4..28768fb128dc 100644
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -183,10 +183,6 @@ var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params
     blinkFeatures: params.blinkfeatures
   }
 
-  if (embedder.getWebPreferences().nodeIntegration === false) {
-    webPreferences.nodeIntegration = false
-  }
-
   if (params.preload) {
     webPreferences.preloadURL = params.preload
   }
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index aca18a2de6c3..64f0eb5d5248 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -107,40 +107,6 @@ describe('<webview> tag', function () {
       document.body.appendChild(webview)
     })
 
-    it('disables node integration when disabled on the parent BrowserWindow', function (done) {
-      var b = undefined
-
-      ipcMain.once('answer', function (event, typeofProcess) {
-        try {
-          assert.equal(typeofProcess, 'undefined')
-          done()
-        } finally {
-          b.close()
-        }
-      })
-
-      var windowUrl = require('url').format({
-        pathname: `${fixtures}/pages/webview-no-node-integration-on-window.html`,
-        protocol: 'file',
-        query: {
-          p: `${fixtures}/pages/web-view-log-process.html`
-        },
-        slashes: true
-      })
-      var preload = path.join(fixtures, 'module', 'answer.js')
-
-      b = new BrowserWindow({
-        height: 400,
-        width: 400,
-        show: false,
-        webPreferences: {
-          preload: preload,
-          nodeIntegration: false,
-        }
-      })
-      b.loadURL(windowUrl)
-    })
-
     it('disables node integration on child windows when it is disabled on the webview', function (done) {
       app.once('browser-window-created', function (event, window) {
         assert.equal(window.webContents.getWebPreferences().nodeIntegration, false)

From 7ce87c470a8ecafd444c149fa22b51c863cf7a52 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 17:10:33 +0900
Subject: [PATCH 210/510] docs: webview is only available with nodeIntegration
 on

---
 docs/api/web-view-tag.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index aa564b79e1fc..e0e8e1033e17 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -12,6 +12,9 @@ app. It doesn't have the same permissions as your web page and all interactions
 between your app and embedded content will be asynchronous. This keeps your app
 safe from the embedded content.
 
+For security purpose, `webview` can only be used in `BrowserWindow`s that have
+`nodeIntegration` enabled.
+
 ## Example
 
 To embed a web page in your app, add the `webview` tag to your app's embedder

From fb6f5320e7d711ed23d79bb92489457ae401415c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 20:33:44 +0900
Subject: [PATCH 211/510] Update brightray for #5348

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index a266ffbdf446..248d42247df0 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit a266ffbdf446b41b9b5d09e55134ebadd774b357
+Subproject commit 248d42247df0a2862144c87c313f37444895861f

From ee9e28dfdfb71a5318f44596486b1a256f1351d7 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 17 May 2016 21:18:31 +0900
Subject: [PATCH 212/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/README.md           | 1 +
 docs-translations/ko-KR/api/accelerator.md  | 1 +
 docs-translations/ko-KR/api/dialog.md       | 7 ++++++-
 docs-translations/ko-KR/faq/electron-faq.md | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs-translations/ko-KR/README.md b/docs-translations/ko-KR/README.md
index 629c3ec8c210..ecb79c0b1fa5 100644
--- a/docs-translations/ko-KR/README.md
+++ b/docs-translations/ko-KR/README.md
@@ -23,6 +23,7 @@ Electron에 대해 자주 묻는 질문이 있습니다. 이슈를 생성하기
 * [보안](tutorial/security.md)
 * [어플리케이션 배포](tutorial/application-distribution.md)
 * [Mac 앱스토어 어플리케이션 제출 가이드](tutorial/mac-app-store-submission-guide.md)
+* [Windows 스토어 가이드](tutorial/windows-store-guide.md)
 * [어플리케이션 패키징](tutorial/application-packaging.md)
 * [네이티브 Node 모듈 사용하기](tutorial/using-native-node-modules.md)
 * [메인 프로세스 디버깅하기](tutorial/debugging-main-process.md)
diff --git a/docs-translations/ko-KR/api/accelerator.md b/docs-translations/ko-KR/api/accelerator.md
index 58d4b41d972a..05532d06c08e 100644
--- a/docs-translations/ko-KR/api/accelerator.md
+++ b/docs-translations/ko-KR/api/accelerator.md
@@ -39,6 +39,7 @@ Linux와 Windows에서는 `Command`키가 없으므로 작동하지 않습니다
 * `~`, `!`, `@`, `#`, `$`, etc 와 같은 구두점 기호들
 * `Plus`
 * `Space`
+* `Tab`
 * `Backspace`
 * `Delete`
 * `Insert`
diff --git a/docs-translations/ko-KR/api/dialog.md b/docs-translations/ko-KR/api/dialog.md
index 30132383b5b8..949a26835db9 100644
--- a/docs-translations/ko-KR/api/dialog.md
+++ b/docs-translations/ko-KR/api/dialog.md
@@ -27,6 +27,8 @@ const {dialog} = require('electron').remote;
 * `options` Object
   * `title` String
   * `defaultPath` String
+  * `buttonLabel` String - 확인 버튼을 위한 커스텀 라벨이며, 빈칸으로 둘 경우 기본
+    라벨이 사용됩니다.
   * `filters` Array
   * `properties` Array - 대화 상자가 사용할 기능(모드)이 담긴 배열입니다.
     다음을 포함할 수 있습니다: `openFile`, `openDirectory`, `multiSelections`,
@@ -71,6 +73,8 @@ const {dialog} = require('electron').remote;
 * `options` Object
   * `title` String
   * `defaultPath` String
+  * `buttonLabel` String - 확인 버튼을 위한 커스텀 라벨이며, 빈칸으로 둘 경우 기본
+    라벨이 사용됩니다.
   * `filters` Array
 * `callback` Function (optional)
 
@@ -90,7 +94,8 @@ const {dialog} = require('electron').remote;
   * `type` String - `"none"`, `"info"`, `"error"`, `"question"`, `"warning"` 중
     하나를 사용할 수 있습니다. Windows에선 따로 `icon`을 설정하지 않은 이상
     "question"과 "info"는 같은 아이콘으로 표시됩니다.
-  * `buttons` Array - 버튼들의 라벨을 포함한 배열입니다.
+  * `buttons` Array - 버튼들의 라벨을 포함한 배열입니다. Windows에서 빈 배열로 둘
+    경우, "OK" 버튼 하나가 포함됩니다.
   * `defaultId` Integer - 메시지 박스가 열렸을 때 기본적으로 선택될 버튼 배열의
     버튼 인덱스입니다.
   * `title` String - 대화 상자의 제목입니다. 몇몇 플랫폼에선 보이지 않을 수 있습니다.
diff --git a/docs-translations/ko-KR/faq/electron-faq.md b/docs-translations/ko-KR/faq/electron-faq.md
index 38235e2d8980..c186d148c2a0 100644
--- a/docs-translations/ko-KR/faq/electron-faq.md
+++ b/docs-translations/ko-KR/faq/electron-faq.md
@@ -9,7 +9,7 @@ Electron의 Chrome 버전은 보통 새로운 Chrome 안정 버전이 릴리즈
 Electron은 크롬이 사용하는 안정된 채널만을 이용합니다, 만약 중요한 수정이 베타 또는
 개발 채널에 패치된 경우, 이전 버전의 채널로 롤백합니다.
 
-자세한 내용은 [보안 설명](../tutorial/electron-security.md)을 참고하세요.
+자세한 내용은 [보안 설명](../tutorial/security.md)을 참고하세요.
 
 ## Electron은 언제 최신 버전의 Node.js로 업그레이드 하나요?
 

From 7e09b1664ad16c1d45a48efc6e06d585360395ef Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Tue, 17 May 2016 20:20:25 +0200
Subject: [PATCH 213/510] :memo: Add Information about Versioning

---
 docs/README.md                       |  1 +
 docs/tutorial/electron-versioning.md | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 docs/tutorial/electron-versioning.md

diff --git a/docs/README.md b/docs/README.md
index 997499329b6c..1faf3d3cdff0 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -18,6 +18,7 @@ an issue:
 
 * [Supported Platforms](tutorial/supported-platforms.md)
 * [Security](tutorial/security.md)
+* [Electron Versioning](tutorial/electron-versioning.md)
 * [Application Distribution](tutorial/application-distribution.md)
 * [Mac App Store Submission Guide](tutorial/mac-app-store-submission-guide.md)
 * [Application Packaging](tutorial/application-packaging.md)
diff --git a/docs/tutorial/electron-versioning.md b/docs/tutorial/electron-versioning.md
new file mode 100644
index 000000000000..b30fa94fc832
--- /dev/null
+++ b/docs/tutorial/electron-versioning.md
@@ -0,0 +1,11 @@
+# Electron Versioning
+
+If you are a seasoned Node developer, you are surely aware of `semver` - and might be used to giving your dependency management systems only rough guidelines rather than fixed version numbers. Due to the hard dependency on Node and Chromium, Electron is in a slightly more difficult position and does not follow semver. You should therefor always reference a specific version of Electron.
+
+Version numbers are bumped using the following rules:
+
+ * Major: For breaking changes in Electron's API - if you upgrade from `0.37.0` to `1.0.0`, you will have to update your app.
+ * Minor: For major Chrome and minor Node upgrades; or significant Electron changes - if you upgrade from `1.0.0` to `1.1.0`, your app is supposed to still work, but you might have to work around small changes.
+ * Patch: For new features and bug fixes - if you upgrade from `1.0.0` to `1.0.1`, your app will continue to work as-is.
+ 
+If you are using `electron-prebuilt`, we recommend that you set a fixed version number (`1.1.0` instead of `^1.1.0`) to ensure that all upgrades of Electron are a manual operation made by you, the developer.

From a7ac7ba4c118e93a8a488c2ac1d84aed1a611d9b Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 17:33:47 -0700
Subject: [PATCH 214/510] Add the dumbest new builtin that works

---
 atom/common/api/atom_api_process_stats.cc | 27 +++++++++++++++++++++++
 atom/common/node_bindings.cc              |  1 +
 filenames.gypi                            |  1 +
 3 files changed, 29 insertions(+)
 create mode 100644 atom/common/api/atom_api_process_stats.cc

diff --git a/atom/common/api/atom_api_process_stats.cc b/atom/common/api/atom_api_process_stats.cc
new file mode 100644
index 000000000000..8023c5a9d215
--- /dev/null
+++ b/atom/common/api/atom_api_process_stats.cc
@@ -0,0 +1,27 @@
+// Copyright (c) 2015 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/common/api/atom_api_native_image.h"
+
+#include <string>
+#include <vector>
+
+#include "atom/common/node_includes.h"
+#include "native_mate/dictionary.h"
+
+namespace {
+
+int32_t AddTwoNumbers(int32_t a, int32_t b) {
+  return a + b;
+}
+
+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context, void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("addTwoNumbers", &AddTwoNumbers);
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_process_stats, Initialize)
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index b3c36fdd8e03..d2d5ebd48890 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -54,6 +54,7 @@ REFERENCE_MODULE(atom_common_clipboard);
 REFERENCE_MODULE(atom_common_crash_reporter);
 REFERENCE_MODULE(atom_common_native_image);
 REFERENCE_MODULE(atom_common_screen);
+REFERENCE_MODULE(atom_common_process_stats);
 REFERENCE_MODULE(atom_common_shell);
 REFERENCE_MODULE(atom_common_v8_util);
 REFERENCE_MODULE(atom_renderer_ipc);
diff --git a/filenames.gypi b/filenames.gypi
index f9bbe8f75f1b..8899b902fca3 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -292,6 +292,7 @@
       'atom/common/api/atom_api_native_image.cc',
       'atom/common/api/atom_api_native_image.h',
       'atom/common/api/atom_api_native_image_mac.mm',
+      'atom/common/api/atom_api_process_stats.cc',
       'atom/common/api/atom_api_shell.cc',
       'atom/common/api/atom_api_v8_util.cc',
       'atom/common/api/atom_bindings.cc',

From f4538daa0a2a632af5b3eb675a7dfb3c0de46260 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 17:33:57 -0700
Subject: [PATCH 215/510] Wire it up

---
 filenames.gypi                     | 1 +
 lib/common/api/exports/electron.js | 6 ++++++
 lib/common/api/process-stats.js    | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 lib/common/api/process-stats.js

diff --git a/filenames.gypi b/filenames.gypi
index 8899b902fca3..162396bccf3d 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -44,6 +44,7 @@
       'lib/common/api/deprecations.js',
       'lib/common/api/exports/electron.js',
       'lib/common/api/native-image.js',
+      'lib/common/api/process-stats.js',
       'lib/common/api/shell.js',
       'lib/common/init.js',
       'lib/common/reset-search-paths.js',
diff --git a/lib/common/api/exports/electron.js b/lib/common/api/exports/electron.js
index 1e9c2d71f3b7..b381a90d675d 100644
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -21,6 +21,12 @@ exports.defineProperties = function (exports) {
         return require('../native-image')
       }
     },
+    processStats: {
+      enumerable: true,
+      get: function () {
+        return require('../process-stats')
+      }
+    },
     shell: {
       enumerable: true,
       get: function () {
diff --git a/lib/common/api/process-stats.js b/lib/common/api/process-stats.js
new file mode 100644
index 000000000000..22ad34c6dd78
--- /dev/null
+++ b/lib/common/api/process-stats.js
@@ -0,0 +1 @@
+module.exports = process.atomBinding('process_stats')

From 191b054ff005be2bfe2946263d088994d7c7c503 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 17:50:58 -0700
Subject: [PATCH 216/510] Implement process and system memory statistics

---
 atom/common/api/atom_api_process_stats.cc | 42 +++++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/atom/common/api/atom_api_process_stats.cc b/atom/common/api/atom_api_process_stats.cc
index 8023c5a9d215..a06fb2e1842a 100644
--- a/atom/common/api/atom_api_process_stats.cc
+++ b/atom/common/api/atom_api_process_stats.cc
@@ -8,18 +8,54 @@
 #include <vector>
 
 #include "atom/common/node_includes.h"
+#include "base/process/process_metrics.h"
 #include "native_mate/dictionary.h"
 
 namespace {
 
-int32_t AddTwoNumbers(int32_t a, int32_t b) {
-  return a + b;
+v8::Local<v8::Value> GetProcessMetrics(v8::Isolate* isolate) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+  std::unique_ptr<base::ProcessMetrics> metrics(
+    base::ProcessMetrics::CreateCurrentProcessMetrics());
+
+  dict.Set("workingSetSize", (double)metrics->GetWorkingSetSize());
+  dict.Set("peakWorkingSetSize", (double)metrics->GetPeakWorkingSetSize());
+
+  size_t private_bytes, shared_bytes;
+  if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
+    dict.set("privateBytes", (double)private_bytes);
+    dict.set("sharedBytes", (double)shared_bytes);
+  }
+
+  return dict.GetHandle();
+}
+
+v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate, mate::Arguments* args) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+  base::SystemMemoryInfoKB memInfo;
+
+  if (!base::GetSystemMemoryInfo(&memInfo)) {
+    args->ThrowError("Unable to retrieve system memory information");
+    return v8::Undefined(isolate);
+  }
+
+  dict.set("total", memInfo.total);
+  dict.set("free", memInfo.free);
+
+  // NB: These return bogus values on OS X
+#if !DEFINED(OS_MACOSX)
+  dict.set("swapTotal", memInfo.swap_total);
+  dict.set("swapFree", memInfo.swap_free);
+#endif
+
+  return dict.GetHandle();
 }
 
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
   mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("addTwoNumbers", &AddTwoNumbers);
+  dict.SetMethod("getProcessMetrics", &GetProcessMetrics);
+  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
 }
 
 }  // namespace

From 75362450cd6496bd7f112e15937152b40926dbe4 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 17:56:40 -0700
Subject: [PATCH 217/510] Everything is in KB

---
 atom/common/api/atom_api_process_stats.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/common/api/atom_api_process_stats.cc b/atom/common/api/atom_api_process_stats.cc
index a06fb2e1842a..8604df67d601 100644
--- a/atom/common/api/atom_api_process_stats.cc
+++ b/atom/common/api/atom_api_process_stats.cc
@@ -18,13 +18,13 @@ v8::Local<v8::Value> GetProcessMetrics(v8::Isolate* isolate) {
   std::unique_ptr<base::ProcessMetrics> metrics(
     base::ProcessMetrics::CreateCurrentProcessMetrics());
 
-  dict.Set("workingSetSize", (double)metrics->GetWorkingSetSize());
-  dict.Set("peakWorkingSetSize", (double)metrics->GetPeakWorkingSetSize());
+  dict.Set("workingSetSize", (double)(metrics->GetWorkingSetSize() >> 10));
+  dict.Set("peakWorkingSetSize", (double)(metrics->GetPeakWorkingSetSize() >> 10));
 
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
-    dict.set("privateBytes", (double)private_bytes);
-    dict.set("sharedBytes", (double)shared_bytes);
+    dict.Set("privateBytes", (double)(private_bytes >> 10));
+    dict.Set("sharedBytes", (double)(shared_bytes >> 10));
   }
 
   return dict.GetHandle();
@@ -39,13 +39,13 @@ v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate, mate::Arguments*
     return v8::Undefined(isolate);
   }
 
-  dict.set("total", memInfo.total);
-  dict.set("free", memInfo.free);
+  dict.Set("total", memInfo.total);
+  dict.Set("free", memInfo.free);
 
   // NB: These return bogus values on OS X
-#if !DEFINED(OS_MACOSX)
-  dict.set("swapTotal", memInfo.swap_total);
-  dict.set("swapFree", memInfo.swap_free);
+#if !defined(OS_MACOSX)
+  dict.Set("swapTotal", memInfo.swap_total);
+  dict.Set("swapFree", memInfo.swap_free);
 #endif
 
   return dict.GetHandle();

From cd7bc0e50cd304878647f28c5be2afff05e0b938 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 17:57:35 -0700
Subject: [PATCH 218/510] Rename Metrics => MemoryInfo so it's consistent

---
 atom/common/api/atom_api_process_stats.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/common/api/atom_api_process_stats.cc b/atom/common/api/atom_api_process_stats.cc
index 8604df67d601..debe40570959 100644
--- a/atom/common/api/atom_api_process_stats.cc
+++ b/atom/common/api/atom_api_process_stats.cc
@@ -13,7 +13,7 @@
 
 namespace {
 
-v8::Local<v8::Value> GetProcessMetrics(v8::Isolate* isolate) {
+v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
   std::unique_ptr<base::ProcessMetrics> metrics(
     base::ProcessMetrics::CreateCurrentProcessMetrics());
@@ -54,7 +54,7 @@ v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate, mate::Arguments*
 void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context, void* priv) {
   mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("getProcessMetrics", &GetProcessMetrics);
+  dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
   dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
 }
 

From 60bc2acd6cec95f337613f08a713045aefe400c3 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 18:01:29 -0700
Subject: [PATCH 219/510] Linting

---
 atom/common/api/atom_api_process_stats.cc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/atom/common/api/atom_api_process_stats.cc b/atom/common/api/atom_api_process_stats.cc
index debe40570959..05cbd3fed3e9 100644
--- a/atom/common/api/atom_api_process_stats.cc
+++ b/atom/common/api/atom_api_process_stats.cc
@@ -18,19 +18,23 @@ v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate) {
   std::unique_ptr<base::ProcessMetrics> metrics(
     base::ProcessMetrics::CreateCurrentProcessMetrics());
 
-  dict.Set("workingSetSize", (double)(metrics->GetWorkingSetSize() >> 10));
-  dict.Set("peakWorkingSetSize", (double)(metrics->GetPeakWorkingSetSize() >> 10));
+  dict.Set("workingSetSize",
+    static_cast<double>(metrics->GetWorkingSetSize() >> 10));
+  dict.Set("peakWorkingSetSize",
+    static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
 
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
-    dict.Set("privateBytes", (double)(private_bytes >> 10));
-    dict.Set("sharedBytes", (double)(shared_bytes >> 10));
+    dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
+    dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
   }
 
   return dict.GetHandle();
 }
 
-v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate, mate::Arguments* args) {
+v8::Local<v8::Value> GetSystemMemoryInfo(
+    v8::Isolate* isolate,
+    mate::Arguments* args) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
   base::SystemMemoryInfoKB memInfo;
 

From b51be9b83f9cc84514b4849181ec3b1d4fa0c749 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 13 May 2016 18:12:33 -0700
Subject: [PATCH 220/510] Add docs

---
 docs/api/process-stats.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 docs/api/process-stats.md

diff --git a/docs/api/process-stats.md b/docs/api/process-stats.md
new file mode 100644
index 000000000000..867c082dff0c
--- /dev/null
+++ b/docs/api/process-stats.md
@@ -0,0 +1,38 @@
+# processStats
+
+> Collect memory statistics about the system as well as the current process (either
+> the main process or any renderer process)
+
+```js
+import {processStats} from 'electron';
+
+processStats.getProcessMemoryInfo();
+>>> Object {workingSetSize: 86052, peakWorkingSetSize: 92244, privateBytes: 25932, sharedBytes: 60248}
+```
+
+## Methods
+
+The processStats has the following methods:
+
+### getProcessMemoryInfo()
+
+Return an object giving memory usage statistics about the current process. Note that
+all statistics are reported in Kilobytes.
+
+* `workingSetSize` - The amount of memory currently pinned to actual physical RAM
+* `peakWorkingSetSize` - The maximum amount of memory that has ever been pinned to actual physical RAM
+* `privateBytes` - The amount of memory not shared by other processes, such as JS heap or HTML content.
+* `sharedBytes` - The amount of memory shared between processes, typically memory consumed by the Electron code itself
+
+### getSystemMemoryInfo()
+
+Return an object giving memory usage statistics about the entire system. Note that
+all statistics are reported in Kilobytes.
+
+* `total` - The total amount of physical memory in Kilobytes available to the system
+* `free` - The total amount of memory not being used by applications or disk cache
+
+On Windows / Linux:
+
+* `swapTotal` - The total amount of swap memory in Kilobytes available to the system
+* `swapFree` - The free amount of swap memory in Kilobytes available to the system

From ae2eec3efa2726be2db6a8c24ceb2160a918e637 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Tue, 17 May 2016 14:37:32 -0700
Subject: [PATCH 221/510] Move process-stats methods to process

---
 lib/common/api/exports/electron.js | 6 ------
 lib/common/api/process-stats.js    | 1 -
 lib/common/init.js                 | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 lib/common/api/process-stats.js

diff --git a/lib/common/api/exports/electron.js b/lib/common/api/exports/electron.js
index b381a90d675d..1e9c2d71f3b7 100644
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -21,12 +21,6 @@ exports.defineProperties = function (exports) {
         return require('../native-image')
       }
     },
-    processStats: {
-      enumerable: true,
-      get: function () {
-        return require('../process-stats')
-      }
-    },
     shell: {
       enumerable: true,
       get: function () {
diff --git a/lib/common/api/process-stats.js b/lib/common/api/process-stats.js
deleted file mode 100644
index 22ad34c6dd78..000000000000
--- a/lib/common/api/process-stats.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = process.atomBinding('process_stats')
diff --git a/lib/common/init.js b/lib/common/init.js
index 257249f0a639..8df576831b5f 100644
--- a/lib/common/init.js
+++ b/lib/common/init.js
@@ -46,3 +46,5 @@ if (process.type === 'browser') {
 if (process.platform === 'win32' && __dirname.indexOf('\\Program Files\\WindowsApps\\') === 2) {
   process.windowsStore = true
 }
+
+Object.assign(Object.getPrototypeOf(process), process.atomBinding('process_stats'))

From 1623622073eebc6b61c2161c9e7ee4601d469fb4 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Tue, 17 May 2016 14:46:50 -0700
Subject: [PATCH 222/510] Dox

---
 docs/api/process.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/api/process.md b/docs/api/process.md
index ec982d3d74aa..14b1c9bd34a7 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -17,6 +17,10 @@ upstream node:
 * `process.defaultApp` Boolean - When app is started by being passed as parameter
   to the default app, this value is `true` in the main process, otherwise it is
   `undefined`.
+* `process.getSystemMemoryInfo` - Returns the amount of system memory and free
+  swap space
+* `process.getProcessMemoryInfo` - Returns the amount of actual memory used by
+  Chromium for the current process.
 
 ## Events
 
@@ -63,3 +67,26 @@ Causes the main thread of the current process hang.
 
 Sets the file descriptor soft limit to `maxDescriptors` or the OS hard
 limit, whichever is lower for the current process.
+
+### getProcessMemoryInfo()
+
+Return an object giving memory usage statistics about the current process. Note that
+all statistics are reported in Kilobytes.
+
+* `workingSetSize` - The amount of memory currently pinned to actual physical RAM
+* `peakWorkingSetSize` - The maximum amount of memory that has ever been pinned to actual physical RAM
+* `privateBytes` - The amount of memory not shared by other processes, such as JS heap or HTML content.
+* `sharedBytes` - The amount of memory shared between processes, typically memory consumed by the Electron code itself
+
+### getSystemMemoryInfo()
+
+Return an object giving memory usage statistics about the entire system. Note that
+all statistics are reported in Kilobytes.
+
+* `total` - The total amount of physical memory in Kilobytes available to the system
+* `free` - The total amount of memory not being used by applications or disk cache
+
+On Windows / Linux:
+
+* `swapTotal` - The total amount of swap memory in Kilobytes available to the system
+* `swapFree` - The free amount of swap memory in Kilobytes available to the system

From bfb4867e10023f9d4e3c4d5b0901a3644d13bfdd Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Tue, 17 May 2016 14:52:01 -0700
Subject: [PATCH 223/510] :fire: old docs

---
 docs/api/process-stats.md | 38 --------------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 docs/api/process-stats.md

diff --git a/docs/api/process-stats.md b/docs/api/process-stats.md
deleted file mode 100644
index 867c082dff0c..000000000000
--- a/docs/api/process-stats.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# processStats
-
-> Collect memory statistics about the system as well as the current process (either
-> the main process or any renderer process)
-
-```js
-import {processStats} from 'electron';
-
-processStats.getProcessMemoryInfo();
->>> Object {workingSetSize: 86052, peakWorkingSetSize: 92244, privateBytes: 25932, sharedBytes: 60248}
-```
-
-## Methods
-
-The processStats has the following methods:
-
-### getProcessMemoryInfo()
-
-Return an object giving memory usage statistics about the current process. Note that
-all statistics are reported in Kilobytes.
-
-* `workingSetSize` - The amount of memory currently pinned to actual physical RAM
-* `peakWorkingSetSize` - The maximum amount of memory that has ever been pinned to actual physical RAM
-* `privateBytes` - The amount of memory not shared by other processes, such as JS heap or HTML content.
-* `sharedBytes` - The amount of memory shared between processes, typically memory consumed by the Electron code itself
-
-### getSystemMemoryInfo()
-
-Return an object giving memory usage statistics about the entire system. Note that
-all statistics are reported in Kilobytes.
-
-* `total` - The total amount of physical memory in Kilobytes available to the system
-* `free` - The total amount of memory not being used by applications or disk cache
-
-On Windows / Linux:
-
-* `swapTotal` - The total amount of swap memory in Kilobytes available to the system
-* `swapFree` - The free amount of swap memory in Kilobytes available to the system

From 189380d4ea54899b8de88b93c3bc0a712b14400b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 14:52:45 -0700
Subject: [PATCH 224/510] Add spec for devtools extension

---
 spec/api-browser-window-spec.js               | 24 +++++++++++++++++++
 .../fixtures/devtools-extensions/foo/foo.html | 10 ++++++++
 .../devtools-extensions/foo/index.html        | 14 +++++++++++
 .../devtools-extensions/foo/manifest.json     |  4 +++-
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/devtools-extensions/foo/foo.html
 create mode 100644 spec/fixtures/devtools-extensions/foo/index.html

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index a8dd8a3780cc..168aceb1d406 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -824,6 +824,30 @@ describe('browser-window module', function () {
   })
 
   describe('dev tool extensions', function () {
+    describe('BrowserWindow.addDevToolsExtension', function () {
+      it('creates the extension', function (done) {
+        var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
+        BrowserWindow.addDevToolsExtension(extensionPath)
+
+        w.webContents.on('devtools-opened', () => {
+          var inputEventIntervalId = setInterval(function () {
+            if (w && w.devToolsWebContents) {
+              w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
+            } else {
+              clearInterval(inputEventIntervalId)
+            }
+          }, 250)
+        })
+        w.loadURL('about:blank')
+        w.webContents.openDevTools({mode: 'bottom'})
+
+        ipcMain.once('answer', function (event, message) {
+          assert.equal(message, 'extension loaded')
+          done()
+        })
+      })
+    })
+
     it('serializes the registered extensions on quit', function () {
       var extensionName = 'foo'
       var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', extensionName)
diff --git a/spec/fixtures/devtools-extensions/foo/foo.html b/spec/fixtures/devtools-extensions/foo/foo.html
new file mode 100644
index 000000000000..a326639c38de
--- /dev/null
+++ b/spec/fixtures/devtools-extensions/foo/foo.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>foo</title>
+    <script>
+      chrome.devtools.panels.create('Foo', 'foo.png', 'index.html')
+    </script>
+  </head>
+</html>
diff --git a/spec/fixtures/devtools-extensions/foo/index.html b/spec/fixtures/devtools-extensions/foo/index.html
new file mode 100644
index 000000000000..4e7439422e47
--- /dev/null
+++ b/spec/fixtures/devtools-extensions/foo/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script>
+      var sendMessage = `require('electron').ipcRenderer.send('answer', 'extension loaded')`
+      window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})
+    </script>
+  </head>
+  <body>
+    a custom devtools extension
+  </body>
+</html>
diff --git a/spec/fixtures/devtools-extensions/foo/manifest.json b/spec/fixtures/devtools-extensions/foo/manifest.json
index bde99de9287a..413853e8d351 100644
--- a/spec/fixtures/devtools-extensions/foo/manifest.json
+++ b/spec/fixtures/devtools-extensions/foo/manifest.json
@@ -1,3 +1,5 @@
 {
-  "name": "foo"
+  "name": "foo",
+  "version": "1.0",
+  "devtools_page": "foo.html"
 }

From dc86ec8ddd7ffd2bcd19ff66b8f13d3ecd8a14f9 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Tue, 17 May 2016 14:54:33 -0700
Subject: [PATCH 225/510] Come Correct with Wrapping

---
 docs/api/process.md | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/docs/api/process.md b/docs/api/process.md
index 14b1c9bd34a7..1ad8dca175dd 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -14,9 +14,9 @@ upstream node:
   other builds it is `undefined`.
 * `process.windowsStore` Boolean - If the app is running as a Windows Store app
   (appx), this value is `true`, for other builds it is `undefined`.
-* `process.defaultApp` Boolean - When app is started by being passed as parameter
-  to the default app, this value is `true` in the main process, otherwise it is
-  `undefined`.
+* `process.defaultApp` Boolean - When app is started by being passed as
+  parameter to the default app, this value is `true` in the main process,
+  otherwise it is `undefined`.
 * `process.getSystemMemoryInfo` - Returns the amount of system memory and free
   swap space
 * `process.getProcessMemoryInfo` - Returns the amount of actual memory used by
@@ -70,23 +70,31 @@ limit, whichever is lower for the current process.
 
 ### getProcessMemoryInfo()
 
-Return an object giving memory usage statistics about the current process. Note that
-all statistics are reported in Kilobytes.
+Return an object giving memory usage statistics about the current process. Note
+that all statistics are reported in Kilobytes.
 
-* `workingSetSize` - The amount of memory currently pinned to actual physical RAM
-* `peakWorkingSetSize` - The maximum amount of memory that has ever been pinned to actual physical RAM
-* `privateBytes` - The amount of memory not shared by other processes, such as JS heap or HTML content.
-* `sharedBytes` - The amount of memory shared between processes, typically memory consumed by the Electron code itself
+* `workingSetSize` - The amount of memory currently pinned to actual physical
+  RAM
+* `peakWorkingSetSize` - The maximum amount of memory that has ever been pinned
+  to actual physical RAM
+* `privateBytes` - The amount of memory not shared by other processes, such as
+  JS heap or HTML content.
+* `sharedBytes` - The amount of memory shared between processes, typically
+  memory consumed by the Electron code itself
 
 ### getSystemMemoryInfo()
 
-Return an object giving memory usage statistics about the entire system. Note that
-all statistics are reported in Kilobytes.
+Return an object giving memory usage statistics about the entire system. Note
+that all statistics are reported in Kilobytes.
 
-* `total` - The total amount of physical memory in Kilobytes available to the system
-* `free` - The total amount of memory not being used by applications or disk cache
+* `total` - The total amount of physical memory in Kilobytes available to the
+  system
+* `free` - The total amount of memory not being used by applications or disk
+  cache
 
 On Windows / Linux:
 
-* `swapTotal` - The total amount of swap memory in Kilobytes available to the system
-* `swapFree` - The free amount of swap memory in Kilobytes available to the system
+* `swapTotal` - The total amount of swap memory in Kilobytes available to the
+  system
+* `swapFree` - The free amount of swap memory in Kilobytes available to the
+  system

From 77b074fbadc8439bb3893180e4b94812de9df961 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 14:56:00 -0700
Subject: [PATCH 226/510] Add spec for undocked devtools

---
 spec/api-browser-window-spec.js | 62 ++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 168aceb1d406..46fc6a34c89e 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -825,25 +825,55 @@ describe('browser-window module', function () {
 
   describe('dev tool extensions', function () {
     describe('BrowserWindow.addDevToolsExtension', function () {
-      it('creates the extension', function (done) {
-        var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-        BrowserWindow.addDevToolsExtension(extensionPath)
+      beforeEach(function () {
+        BrowserWindow.removeDevToolsExtension('foo')
+      })
 
-        w.webContents.on('devtools-opened', () => {
-          var inputEventIntervalId = setInterval(function () {
-            if (w && w.devToolsWebContents) {
-              w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
-            } else {
-              clearInterval(inputEventIntervalId)
-            }
-          }, 250)
+      describe('when the devtools is docked', function () {
+        it('creates the extension', function (done) {
+          var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
+          BrowserWindow.addDevToolsExtension(extensionPath)
+
+          w.webContents.on('devtools-opened', () => {
+            var inputEventIntervalId = setInterval(function () {
+              if (w && w.devToolsWebContents) {
+                w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
+              } else {
+                clearInterval(inputEventIntervalId)
+              }
+            }, 250)
+          })
+          w.loadURL('about:blank')
+          w.webContents.openDevTools({mode: 'bottom'})
+
+          ipcMain.once('answer', function (event, message) {
+            assert.equal(message, 'extension loaded')
+            done()
+          })
         })
-        w.loadURL('about:blank')
-        w.webContents.openDevTools({mode: 'bottom'})
+      })
 
-        ipcMain.once('answer', function (event, message) {
-          assert.equal(message, 'extension loaded')
-          done()
+      describe('when the devtools is undocked', function () {
+        it('creates the extension', function (done) {
+          var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
+          BrowserWindow.addDevToolsExtension(extensionPath)
+
+          w.webContents.on('devtools-opened', () => {
+            var inputEventIntervalId = setInterval(function () {
+              if (w && w.devToolsWebContents) {
+                w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
+              } else {
+                clearInterval(inputEventIntervalId)
+              }
+            }, 250)
+          })
+          w.loadURL('about:blank')
+          w.webContents.openDevTools({mode: 'undocked'})
+
+          ipcMain.once('answer', function (event, message) {
+            assert.equal(message, 'extension loaded')
+            done()
+          })
         })
       })
     })

From 7db2601ea8c5fc6f30f632896308793019bc3e8a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 14:59:33 -0700
Subject: [PATCH 227/510] DRY up specs

---
 spec/api-browser-window-spec.js | 43 +++++++++++++--------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 46fc6a34c89e..6178d7639848 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -825,25 +825,29 @@ describe('browser-window module', function () {
 
   describe('dev tool extensions', function () {
     describe('BrowserWindow.addDevToolsExtension', function () {
+      this.timeout(10000)
+
       beforeEach(function () {
         BrowserWindow.removeDevToolsExtension('foo')
+
+        var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
+        BrowserWindow.addDevToolsExtension(extensionPath)
+
+        w.webContents.on('devtools-opened', () => {
+          var inputEventIntervalId = setInterval(function () {
+            if (w && w.devToolsWebContents) {
+              w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
+            } else {
+              clearInterval(inputEventIntervalId)
+            }
+          }, 200)
+        })
+
+        w.loadURL('about:blank')
       })
 
       describe('when the devtools is docked', function () {
         it('creates the extension', function (done) {
-          var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-          BrowserWindow.addDevToolsExtension(extensionPath)
-
-          w.webContents.on('devtools-opened', () => {
-            var inputEventIntervalId = setInterval(function () {
-              if (w && w.devToolsWebContents) {
-                w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
-              } else {
-                clearInterval(inputEventIntervalId)
-              }
-            }, 250)
-          })
-          w.loadURL('about:blank')
           w.webContents.openDevTools({mode: 'bottom'})
 
           ipcMain.once('answer', function (event, message) {
@@ -855,19 +859,6 @@ describe('browser-window module', function () {
 
       describe('when the devtools is undocked', function () {
         it('creates the extension', function (done) {
-          var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
-          BrowserWindow.addDevToolsExtension(extensionPath)
-
-          w.webContents.on('devtools-opened', () => {
-            var inputEventIntervalId = setInterval(function () {
-              if (w && w.devToolsWebContents) {
-                w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
-              } else {
-                clearInterval(inputEventIntervalId)
-              }
-            }, 250)
-          })
-          w.loadURL('about:blank')
           w.webContents.openDevTools({mode: 'undocked'})
 
           ipcMain.once('answer', function (event, message) {

From 0b4b79d0a4192e1b828b4620a6aa8a5a2ca02ab6 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 15:01:32 -0700
Subject: [PATCH 228/510] Use control on non-mac platforms

---
 spec/api-browser-window-spec.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 6178d7639848..bd4e6ea45708 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -836,7 +836,11 @@ describe('browser-window module', function () {
         w.webContents.on('devtools-opened', () => {
           var inputEventIntervalId = setInterval(function () {
             if (w && w.devToolsWebContents) {
-              w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']})
+              w.devToolsWebContents.sendInputEvent({
+                type: 'keyDown',
+                keyCode:'[',
+                modifiers: process.platform === 'darwin' ? ['meta'] : ['control']
+              })
             } else {
               clearInterval(inputEventIntervalId)
             }

From 8d0c5c30b860fa97c638edab48959a0963ee77b2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 15:05:27 -0700
Subject: [PATCH 229/510] Use consistent function styles

---
 spec/api-browser-window-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index bd4e6ea45708..f698121e152b 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -833,7 +833,7 @@ describe('browser-window module', function () {
         var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
         BrowserWindow.addDevToolsExtension(extensionPath)
 
-        w.webContents.on('devtools-opened', () => {
+        w.webContents.on('devtools-opened', function () {
           var inputEventIntervalId = setInterval(function () {
             if (w && w.devToolsWebContents) {
               w.devToolsWebContents.sendInputEvent({

From 13cfc2d2a0324e528ba4150b471454526a6d9446 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 15:05:58 -0700
Subject: [PATCH 230/510] Add comment about panel switching via input event

---
 spec/api-browser-window-spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index f698121e152b..a70d4f708899 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -836,6 +836,7 @@ describe('browser-window module', function () {
         w.webContents.on('devtools-opened', function () {
           var inputEventIntervalId = setInterval(function () {
             if (w && w.devToolsWebContents) {
+              // Switch panels until the custom one is selected and loads
               w.devToolsWebContents.sendInputEvent({
                 type: 'keyDown',
                 keyCode:'[',

From 2043356fa32c42e7a838f21181d566e6b8dc082c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 15:09:09 -0700
Subject: [PATCH 231/510] Recommend electron-chromedriver

---
 docs/tutorial/using-selenium-and-webdriver.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/using-selenium-and-webdriver.md b/docs/tutorial/using-selenium-and-webdriver.md
index 7cfa24ef31e8..05b8c4b894be 100644
--- a/docs/tutorial/using-selenium-and-webdriver.md
+++ b/docs/tutorial/using-selenium-and-webdriver.md
@@ -21,7 +21,8 @@ a Node package for testing with web driver, we will use it as an example.
 First you need to download the `chromedriver` binary, and run it:
 
 ```bash
-$ ./chromedriver
+$ npm install electron-chromedriver
+$ ./node_modules/.bin/chromedriver
 Starting ChromeDriver (v2.10.291558) on port 9515
 Only local connections are allowed.
 ```
@@ -77,7 +78,8 @@ driver.
 First you need to download the `chromedriver` binary, and run it:
 
 ```bash
-$ chromedriver --url-base=wd/hub --port=9515
+$ npm install electron-chromedriver
+$ ./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515
 Starting ChromeDriver (v2.10.291558) on port 9515
 Only local connections are allowed.
 ```

From 3f3871b1be29ff1b5e5e7cba936e0b761cab5402 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 15:13:26 -0700
Subject: [PATCH 232/510] Add spectron section

---
 docs/tutorial/using-selenium-and-webdriver.md | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/using-selenium-and-webdriver.md b/docs/tutorial/using-selenium-and-webdriver.md
index 05b8c4b894be..15925825710c 100644
--- a/docs/tutorial/using-selenium-and-webdriver.md
+++ b/docs/tutorial/using-selenium-and-webdriver.md
@@ -8,8 +8,46 @@ From [ChromeDriver - WebDriver for Chrome][chrome-driver]:
 > implements WebDriver's wire protocol for Chromium. It is being developed by
 > members of the Chromium and WebDriver teams.
 
-In order to use `chromedriver` with Electron you have to tell it where to
-find Electron and make it think Electron is the Chrome browser.
+## Setting up Spectron
+
+[Spectron][spectron] is the officially supported ChromeDriver testing framework
+for Electron. It is built on top of [WebdriverIO](http://webdriver.io/) and
+has helpers to access Electron APIs in your tests and bundles the version
+of ChromeDriver for Electron.
+
+```bash
+$ npm install --save-dev spectron
+```
+
+```js
+// A simple test to verify a visible window is opened with a title
+var Application = require('spectron').Application
+var assert = require('assert')
+
+var app = new Application({
+  path: '/Applications/MyApp.app/Contents/MacOS/MyApp'
+})
+
+app.start().then(function () {
+  // Check if the window is visible
+  return app.browserWindow.isVisible()
+}).then(function (isVisible) {
+  // Verify the window is visible
+  assert.equal(isVisible, true)
+}).then(function () {
+  // Get the window's title
+  return app.client.getTitle()
+}).then(function (title) {
+  // Verify the window's title
+  assert.equal(title, 'My App')
+}).then(function () {
+  // Stop the application
+  return app.stop()
+}).catch(function (error) {
+  // Log any failures
+  console.error('Test failed', error.message)
+})
+```
 
 ## Setting up with WebDriverJs
 
@@ -132,3 +170,4 @@ your app's folder. This eliminates the need to copy-paste your app into
 Electron's resource directory.
 
 [chrome-driver]: https://sites.google.com/a/chromium.org/chromedriver/
+[spectron]: http://electron.atom.io/spectron

From b301c473cdf26191281b560076b964e62a255567 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 15:14:50 -0700
Subject: [PATCH 233/510] Simplify sentence

---
 docs/tutorial/using-selenium-and-webdriver.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/tutorial/using-selenium-and-webdriver.md b/docs/tutorial/using-selenium-and-webdriver.md
index 15925825710c..4002f0122411 100644
--- a/docs/tutorial/using-selenium-and-webdriver.md
+++ b/docs/tutorial/using-selenium-and-webdriver.md
@@ -12,8 +12,7 @@ From [ChromeDriver - WebDriver for Chrome][chrome-driver]:
 
 [Spectron][spectron] is the officially supported ChromeDriver testing framework
 for Electron. It is built on top of [WebdriverIO](http://webdriver.io/) and
-has helpers to access Electron APIs in your tests and bundles the version
-of ChromeDriver for Electron.
+has helpers to access Electron APIs in your tests and bundles ChromeDriver.
 
 ```bash
 $ npm install --save-dev spectron

From bfb75df49c2af01aa053b2e865e5a6d084614f90 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 16:02:54 -0700
Subject: [PATCH 234/510] Tweak doc headings

---
 docs/api/chrome-command-line-switches.md       | 2 +-
 docs/api/environment-variables.md              | 2 +-
 docs/api/web-view-tag.md                       | 2 +-
 docs/api/window-open.md                        | 2 +-
 docs/development/debug-instructions-windows.md | 2 +-
 docs/tutorial/testing-on-headless-ci.md        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md
index 751d9295614f..ea8a195eb2cc 100644
--- a/docs/api/chrome-command-line-switches.md
+++ b/docs/api/chrome-command-line-switches.md
@@ -1,4 +1,4 @@
-# Supported Chrome command line switches
+# Supported Chrome Command Line Switches
 
 > Command line switches supported by Electron.
 
diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index e01afff5fa76..819af6c99ec6 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -1,4 +1,4 @@
-# Environment variables
+# Environment Variables
 
 > Control application configuration and behavior without changing code.
 
diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index aa564b79e1fc..32380eccce98 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -1,4 +1,4 @@
-# The `<webview>` tag
+# `<webview>` Tag
 
 > Display external web content in an isolated frame and process.
 
diff --git a/docs/api/window-open.md b/docs/api/window-open.md
index abb0760f121e..7f9400bfae9f 100644
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -1,4 +1,4 @@
-# The `window.open` function
+# `window.open` Function
 
 > Open a new window and load a URL.
 
diff --git a/docs/development/debug-instructions-windows.md b/docs/development/debug-instructions-windows.md
index 509970237d66..b2d33473934a 100644
--- a/docs/development/debug-instructions-windows.md
+++ b/docs/development/debug-instructions-windows.md
@@ -1,4 +1,4 @@
-# Debugging Electron in Windows
+# Debugging on Windows
 
 If you experience crashes or issues in Electron that you believe are not caused
 by your JavaScript application, but instead by Electron itself, debugging can
diff --git a/docs/tutorial/testing-on-headless-ci.md b/docs/tutorial/testing-on-headless-ci.md
index f9090a6cbd79..d2697d5cfc9a 100644
--- a/docs/tutorial/testing-on-headless-ci.md
+++ b/docs/tutorial/testing-on-headless-ci.md
@@ -1,4 +1,4 @@
-# Testing Electron with headless CI Systems (Travis CI, Jenkins)
+# Testing with Headless CI Systems (Travis CI, Jenkins)
 
 Being based on Chromium, Electron requires a display driver to function.
 If Chromium can't find a display driver, Electron will simply fail to launch -

From 866260a2a6f6a878c678ce3fa997533f8d662656 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 16:05:47 -0700
Subject: [PATCH 235/510] with -> on

---
 docs/tutorial/testing-on-headless-ci.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/testing-on-headless-ci.md b/docs/tutorial/testing-on-headless-ci.md
index d2697d5cfc9a..5e75235d4f28 100644
--- a/docs/tutorial/testing-on-headless-ci.md
+++ b/docs/tutorial/testing-on-headless-ci.md
@@ -1,4 +1,4 @@
-# Testing with Headless CI Systems (Travis CI, Jenkins)
+# Testing on Headless CI Systems (Travis CI, Jenkins)
 
 Being based on Chromium, Electron requires a display driver to function.
 If Chromium can't find a display driver, Electron will simply fail to launch -

From f95c46d987cf29fb8f842028fd4cc3e12b8bb3b8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 16:40:34 -0700
Subject: [PATCH 236/510] Show last panel by id

---
 spec/api-browser-window-spec.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index a70d4f708899..a6da7f712ac4 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -836,16 +836,14 @@ describe('browser-window module', function () {
         w.webContents.on('devtools-opened', function () {
           var inputEventIntervalId = setInterval(function () {
             if (w && w.devToolsWebContents) {
-              // Switch panels until the custom one is selected and loads
-              w.devToolsWebContents.sendInputEvent({
-                type: 'keyDown',
-                keyCode:'[',
-                modifiers: process.platform === 'darwin' ? ['meta'] : ['control']
-              })
+              w.devToolsWebContents.executeJavaScript('(' + (function () {
+                var lastPanelId = WebInspector.inspectorView._tabbedPane._tabs.peekLast().id
+                WebInspector.inspectorView.showPanel(lastPanelId);
+              }).toString() + ')()')
             } else {
               clearInterval(inputEventIntervalId)
             }
-          }, 200)
+          }, 100)
         })
 
         w.loadURL('about:blank')

From 9266f9abfc1e0b8e8ad3ad5881ccdcca307f5a66 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 16:42:21 -0700
Subject: [PATCH 237/510] Update interval id variable name

---
 spec/api-browser-window-spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index a6da7f712ac4..9b07cb644535 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -834,14 +834,14 @@ describe('browser-window module', function () {
         BrowserWindow.addDevToolsExtension(extensionPath)
 
         w.webContents.on('devtools-opened', function () {
-          var inputEventIntervalId = setInterval(function () {
+          var showPanelIntevalId = setInterval(function () {
             if (w && w.devToolsWebContents) {
               w.devToolsWebContents.executeJavaScript('(' + (function () {
                 var lastPanelId = WebInspector.inspectorView._tabbedPane._tabs.peekLast().id
                 WebInspector.inspectorView.showPanel(lastPanelId);
               }).toString() + ')()')
             } else {
-              clearInterval(inputEventIntervalId)
+              clearInterval(showPanelIntevalId)
             }
           }, 100)
         })

From cee31ff67a0b8b451a19a26d32b9dfee9a9f2faf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 17 May 2016 16:42:37 -0700
Subject: [PATCH 238/510] Remove semicolon

---
 spec/api-browser-window-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 9b07cb644535..52af001d765f 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -838,7 +838,7 @@ describe('browser-window module', function () {
             if (w && w.devToolsWebContents) {
               w.devToolsWebContents.executeJavaScript('(' + (function () {
                 var lastPanelId = WebInspector.inspectorView._tabbedPane._tabs.peekLast().id
-                WebInspector.inspectorView.showPanel(lastPanelId);
+                WebInspector.inspectorView.showPanel(lastPanelId)
               }).toString() + ')()')
             } else {
               clearInterval(showPanelIntevalId)

From 7bd11c14f600647df43d31f3aaf54959e8a61fab Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 09:42:38 +0900
Subject: [PATCH 239/510] Update brightray to fix linking problem on Linux

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index 248d42247df0..d5ddb834fe5b 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 248d42247df0a2862144c87c313f37444895861f
+Subproject commit d5ddb834fe5bc7d914e098ecf7c35b10b5322f54

From 467ccabb7ee32486cbb86d639a29c9bf9fadf255 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Wed, 18 May 2016 06:56:58 +0530
Subject: [PATCH 240/510] browser: flag to disable HTTP/2 and SPDY/3.1
 protocols

---
 docs/api/chrome-command-line-switches.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md
index 751d9295614f..628c33bb37bd 100644
--- a/docs/api/chrome-command-line-switches.md
+++ b/docs/api/chrome-command-line-switches.md
@@ -24,6 +24,10 @@ Ignore the connections limit for `domains` list separated by `,`.
 
 Disables the disk cache for HTTP requests.
 
+## --disable-http2
+
+Disable HTTP/2 and SPDY/3.1 protocols.
+
 ## --remote-debugging-port=`port`
 
 Enables remote debugging over HTTP on the specified `port`.

From 7fd31490319be56f24029c4db04a8bbade0149c4 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 18 May 2016 12:15:29 +0900
Subject: [PATCH 241/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/README.md             |  1 +
 docs-translations/ko-KR/api/app.md            |  9 +++++----
 docs-translations/ko-KR/api/auto-updater.md   |  6 ++++++
 .../ko-KR/api/environment-variables.md        |  6 +-----
 docs-translations/ko-KR/api/remote.md         |  2 +-
 docs-translations/ko-KR/api/synopsis.md       | 20 -------------------
 docs-translations/ko-KR/api/web-view-tag.md   |  2 ++
 .../source-code-directory-structure.md        |  4 +++-
 .../ko-KR/tutorial/electron-versioning.md     | 20 +++++++++++++++++++
 9 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 docs-translations/ko-KR/tutorial/electron-versioning.md

diff --git a/docs-translations/ko-KR/README.md b/docs-translations/ko-KR/README.md
index ecb79c0b1fa5..b484d6dc8d71 100644
--- a/docs-translations/ko-KR/README.md
+++ b/docs-translations/ko-KR/README.md
@@ -21,6 +21,7 @@ Electron에 대해 자주 묻는 질문이 있습니다. 이슈를 생성하기
 
 * [지원하는 플랫폼](tutorial/supported-platforms.md)
 * [보안](tutorial/security.md)
+* [Electron 버전 관리](tutorial/electron-versioning.md)
 * [어플리케이션 배포](tutorial/application-distribution.md)
 * [Mac 앱스토어 어플리케이션 제출 가이드](tutorial/mac-app-store-submission-guide.md)
 * [Windows 스토어 가이드](tutorial/windows-store-guide.md)
diff --git a/docs-translations/ko-KR/api/app.md b/docs-translations/ko-KR/api/app.md
index b0bf4d73601c..fbf1fcd29378 100644
--- a/docs-translations/ko-KR/api/app.md
+++ b/docs-translations/ko-KR/api/app.md
@@ -24,7 +24,7 @@ Windows, Linux 운영체제에서의 `will-finish-launching` 이벤트는 `ready
 `open-file`과 `open-url` 이벤트 리스너를 설정하고 crash reporter와 auto updater를
 시작합니다.
 
-대부분의 경우, 모든 것을 `ready` 이벤트 핸들러로 해결해야 합니다.
+대부분의 경우, 모든 것을 `ready` 이벤트 핸들러 안에서 해결해야 합니다.
 
 ### Event: 'ready'
 
@@ -34,8 +34,9 @@ Electron이 초기화를 끝냈을 때 발생하는 이벤트입니다.
 
 모든 윈도우가 종료되었을 때 발생하는 이벤트입니다.
 
-이 이벤트는 어플리케이션이 완전히 종료되지 않았을 때만 발생합니다.
-만약 사용자가 `Cmd + Q`를 입력했거나 개발자가 `app.quit()`를 호출했다면,
+만약 이 이벤트를 구독하지 않은 상태로 모든 윈도우가 닫혔을 때의 기본 동작은 앱을
+종료하는 것입니다. 하지만, 이 이벤트를 구독하면, 앱을 종료할지 다른 일을 할지 제어할
+수 있습니다. 만약 사용자가 `Cmd + Q`를 입력했거나 개발자가 `app.quit()`를 호출했다면,
 Electron은 먼저 모든 윈도우의 종료를 시도하고 `will-quit` 이벤트를 발생시킵니다.
 그리고 `will-quit` 이벤트가 발생했을 땐 `window-all-closed` 이벤트가 발생하지
 않습니다.
@@ -63,7 +64,7 @@ Returns:
 모든 윈도우들이 종료되고 어플리케이션이 종료되기 시작할 때 발생하는 이벤트입니다.
 `event.preventDefault()` 호출을 통해 어플리케이션의 종료를 방지할 수 있습니다.
 
-`will-quit` 와 `window-all-closed` 이벤트의 차이점을 확인하려면 `window-all-close`
+`will-quit` 와 `window-all-closed` 이벤트의 차이점을 확인하려면 `window-all-closed`
 이벤트의 설명을 참고하세요.
 
 ### Event: 'quit'
diff --git a/docs-translations/ko-KR/api/auto-updater.md b/docs-translations/ko-KR/api/auto-updater.md
index a551459171d2..86ec45390d34 100644
--- a/docs-translations/ko-KR/api/auto-updater.md
+++ b/docs-translations/ko-KR/api/auto-updater.md
@@ -34,6 +34,11 @@ Windows에선 `auto-updater` 모듈을 사용하기 전에 어플리케이션을
 설치해야 합니다. [grunt-electron-installer][installer]를 사용하여 어플리케이션
 인스톨러를 만드는 것을 권장합니다.
 
+Windows에선 `autoUpdater` 모듈을 사용하기 전에 사용자의 장치에 어플리케이션을
+설치해야 합니다. 따라서 [electron-winstaller][installer-lib] 모듈이나
+[grunt-electron-installer][installer] 패키지를 사용하여 어플리케이션 인스톨러를
+만드는 것을 권장합니다.
+
 Squirrel로 생성된 인스톨러는 [Application User Model ID][app-user-model-id]와 함께
 `com.squirrel.PACKAGE_ID.YOUR_EXE_WITHOUT_DOT_EXE`으로 형식화된 바로가기 아이콘을
 생성합니다. `com.squirrel.slack.Slack` 과 `com.squirrel.code.Code`가 그 예시입니다.
@@ -108,6 +113,7 @@ Returns:
 [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
 [squirrel-windows]: https://github.com/Squirrel/Squirrel.Windows
 [installer]: https://github.com/electron/grunt-electron-installer
+[installer-lib]: https://github.com/electron/windows-installer
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
 [electron-release-server]: https://github.com/ArekSredzki/electron-release-server
 [squirrel-updates-server]: https://github.com/Aluxian/squirrel-updates-server
diff --git a/docs-translations/ko-KR/api/environment-variables.md b/docs-translations/ko-KR/api/environment-variables.md
index 55a5ac5385de..f24532a698bf 100644
--- a/docs-translations/ko-KR/api/environment-variables.md
+++ b/docs-translations/ko-KR/api/environment-variables.md
@@ -50,8 +50,4 @@ Electron이 크래시되면, 크래시 정보 창을 표시합니다.
 
 ## `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
 
-Linux의 글로벌 메뉴 막대를 사용하지 않습니다.
-
-## `ELECTRON_HIDE_INTERNAL_MODULES`
-
-`require('ipc')`같은 예전 방식의 빌트인 모듈을 비활성화합니다.
+Linux의 전역 메뉴바를 사용하지 않습니다.
diff --git a/docs-translations/ko-KR/api/remote.md b/docs-translations/ko-KR/api/remote.md
index da8a54413e15..e626780a99c6 100644
--- a/docs-translations/ko-KR/api/remote.md
+++ b/docs-translations/ko-KR/api/remote.md
@@ -107,7 +107,7 @@ remote.getCurrentWindow().on('close', () => {
 창을 새로고침 할 때마다 콜백을 새로 설치합니다. 게다가 이전 콜백이 제거되지 않고
 계속해서 쌓이면서 메모리 누수가 발생합니다.
 
-설상가상으로 이전에 등록된 콜백의 콘텍스트가 릴리즈 되고 난 후 (e.g. 페이지 새로고침)
+설상가상으로 이전에 등록된 콜백의 컨텍스트가 릴리즈 되고 난 후 (e.g. 페이지 새로고침)
 `close` 이벤트가 발생하면 예외가 발생하고 메인 프로세스가 작동 중지됩니다.
 
 이러한 문제를 피하려면 렌더러 프로세스에서 메인 프로세스로 넘긴 함수의 참조를 사용 후
diff --git a/docs-translations/ko-KR/api/synopsis.md b/docs-translations/ko-KR/api/synopsis.md
index 04134689a9fa..cb2ea015e295 100644
--- a/docs-translations/ko-KR/api/synopsis.md
+++ b/docs-translations/ko-KR/api/synopsis.md
@@ -71,25 +71,5 @@ const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 ```
 
-## 이전 스타일의 빌트인 모듈 비활성화
-
-v0.35.0 이전 버전에선 빌트인 모듈이 모두 `require('module-name')`같은 형식으로
-사용되었습니다. 하지만 [많은 단점][issue-387]이 있기 때문에 현재 API가 변경되었습니다.
-하지만 오래된 앱의 호환성 유지를 위해 아직 구 버전 API를 지원하고 있습니다.
-
-완벽하게 모든 구 버전 API를 비활성화하려면 `ELECTRON_HIDE_INTERNAL_MODULES` 환경
-변수를 설정하면 됩니다:
-
-```javascript
-process.env.ELECTRON_HIDE_INTERNAL_MODULES = 'true'
-```
-
-또는 `hideInternalModules` API를 사용해도 됩니다:
-
-```javascript
-require('electron').hideInternalModules();
-```
-
 [gui]: https://en.wikipedia.org/wiki/Graphical_user_interface
 [destructuring-assignment]: https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment
-[issue-387]: https://github.com/electron/electron/issues/387
diff --git a/docs-translations/ko-KR/api/web-view-tag.md b/docs-translations/ko-KR/api/web-view-tag.md
index 3191db71331e..7adbe5cbd188 100644
--- a/docs-translations/ko-KR/api/web-view-tag.md
+++ b/docs-translations/ko-KR/api/web-view-tag.md
@@ -11,6 +11,8 @@
 상호작용이 비동기로 작동한다는 것을 의미합니다. 따라서 임베디드 콘텐츠로부터
 어플리케이션을 안전하게 유지할 수 있습니다.
 
+보안상의 이유로, `webview`는 `nodeIntegration`이 활성화된 `BrowserWindow`에서만 사용할 수 있습니다.
+
 ## 예시
 
 웹 페이지를 어플리케이션에 삽입하려면 `webview` 태그를 사용해 원하는 타겟 페이지에
diff --git a/docs-translations/ko-KR/development/source-code-directory-structure.md b/docs-translations/ko-KR/development/source-code-directory-structure.md
index 98a3fd2a1de0..003eca596839 100644
--- a/docs-translations/ko-KR/development/source-code-directory-structure.md
+++ b/docs-translations/ko-KR/development/source-code-directory-structure.md
@@ -60,7 +60,7 @@ Electron
 
 ## Git 서브 모듈 최신 버전으로 유지
 
-Electron 저장소는 몇 가지 외부 벤더 종속성을 가지고 있으며 [/vendor](/vendor)
+Electron 저장소는 몇 가지 외부 벤더 종속성을 가지고 있으며 [/vendor][vendor]
 디렉터리에서 확인할 수 있습니다. 때때로 `git status`를 실행했을 때 아마 다음과 같은
 메시지를 흔히 목격할 것입니다:
 
@@ -84,3 +84,5 @@ git submodule update --init --recursive
 [alias]
 	su = submodule update --init --recursive
 ```
+
+[vendor]: https://github.com/electron/electron/tree/master/vendor
diff --git a/docs-translations/ko-KR/tutorial/electron-versioning.md b/docs-translations/ko-KR/tutorial/electron-versioning.md
new file mode 100644
index 000000000000..13d83563033d
--- /dev/null
+++ b/docs-translations/ko-KR/tutorial/electron-versioning.md
@@ -0,0 +1,20 @@
+# Electron 버전 관리
+
+노련한 Node 개발자라면, `semver` (유의적 버전)에 대해 확실히 알고 있을 것입니다 -
+그리고 제공된 의존성 관리 시스템은 고정된 버전 숫자 대신 견고한 가이드라인을 따릅니다.
+Electron은 Node와 Chromium에 큰 의존성을 지니고 있는 만큼, 유의적 버전을 그대로
+따르지 않습니다. 따라서 항상 Electron의 특정 버전을 참조해야 합니다.
+
+버전 숫자는 다음과 같은 규칙으로 올라갑니다:
+
+* Major: Electron API의 주요 변경 사항을 반영합니다 - 만약 `0.37.0`에서 `1.0.0`로
+  업그레이드하는 경우, 어플리케이션을 업데이트해야 합니다.
+* Minor: 주요 Chrome과 Node 버전의 업그레이드를 반영하거나; Electron의 중요한 변경
+  사항을 반영합니다 - 만약 `1.0.0`에서 `1.1.0`로 업그레이드하는 경우, 어플리케이션은
+  여전히 작동하겠지만, 약간의 업데이트가 필요할 수 있습니다.
+* Patch: 새로운 기능과 버그 수정을 반영합니다 - 만약 `1.0.0`에서 `1.0.1`로
+  업그레이드하는 경우, 어플리케이션은 잘 작동할 것입니다.
+
+`electron-prebuilt`를 사용하고 있다면, Electron의 변경 사항을 확실하게 인지하고
+개발자 스스로 업그레이드를 적용하기 위해 고정된 버전 숫자를 사용하는 것을 권장합니다.
+(`^1.1.0` 대신 `1.1.0` 사용)

From 118afab67b0b28b8962abafa838684d71a013013 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 21:49:05 +0900
Subject: [PATCH 242/510] Make sure BrowserContext is always destroyed after
 WebContents

---
 atom/browser/api/atom_api_web_contents.cc    | 4 ++--
 atom/browser/common_web_contents_delegate.cc | 4 +++-
 atom/browser/common_web_contents_delegate.h  | 7 ++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 8761482bae7d..e3d7c1f2bef2 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -274,7 +274,7 @@ WebContents::WebContents(v8::Isolate* isolate,
   }
 
   Observe(web_contents);
-  InitWithWebContents(web_contents);
+  InitWithWebContents(web_contents, session->browser_context());
 
   managed_web_contents()->GetView()->SetDelegate(this);
 
@@ -397,7 +397,7 @@ void WebContents::HandleKeyboardEvent(
   if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen()) {
     // Escape exits tabbed fullscreen mode.
     ExitFullscreenModeForTab(source);
-  } else if (type_ == BROWSER_WINDOW) {
+  } else if (type_ == BROWSER_WINDOW && owner_window()) {
     owner_window()->HandleKeyboardEvent(source, event);
   } else if (type_ == WEB_VIEW && guest_delegate_) {
     // Send the unhandled keyboard events back to the embedder.
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index 2093b8f48994..d4b3f187a209 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -182,7 +182,9 @@ CommonWebContentsDelegate::~CommonWebContentsDelegate() {
 }
 
 void CommonWebContentsDelegate::InitWithWebContents(
-    content::WebContents* web_contents) {
+    content::WebContents* web_contents,
+    AtomBrowserContext* browser_context) {
+  browser_context_ = browser_context;
   web_contents->SetDelegate(this);
 
   printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index dbd5ddeebd9c..8ea04afebe24 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -19,6 +19,7 @@ using brightray::DevToolsFileSystemIndexer;
 
 namespace atom {
 
+class AtomBrowserContext;
 class AtomJavaScriptDialogManager;
 class NativeWindow;
 class WebDialogHelper;
@@ -33,7 +34,8 @@ class CommonWebContentsDelegate
 
   // Creates a InspectableWebContents object and takes onwership of
   // |web_contents|.
-  void InitWithWebContents(content::WebContents* web_contents);
+  void InitWithWebContents(content::WebContents* web_contents,
+                           AtomBrowserContext* browser_context);
 
   // Set the window as owner window.
   void SetOwnerWindow(NativeWindow* owner_window);
@@ -145,6 +147,9 @@ class CommonWebContentsDelegate
   scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
   scoped_refptr<DevToolsFileSystemIndexer> devtools_file_system_indexer_;
 
+  // Make sure BrowserContext is alwasys destroyed after WebContents.
+  scoped_refptr<AtomBrowserContext> browser_context_;
+
   // The stored InspectableWebContents object.
   // Notice that web_contents_ must be placed after dialog_manager_, so we can
   // make sure web_contents_ is destroyed before dialog_manager_, otherwise a

From 8a061b7183d170c51a1897e51c42f397584d3c56 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 21:50:47 +0900
Subject: [PATCH 243/510] A normal WebContents can have no owner window

---
 atom/browser/api/atom_api_web_contents.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index e3d7c1f2bef2..6a254ab8b4e8 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -379,7 +379,7 @@ void WebContents::MoveContents(content::WebContents* source,
 
 void WebContents::CloseContents(content::WebContents* source) {
   Emit("close");
-  if (type_ == BROWSER_WINDOW)
+  if (type_ == BROWSER_WINDOW && owner_window())
     owner_window()->CloseContents(source);
 }
 
@@ -430,13 +430,13 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
 
 void WebContents::RendererUnresponsive(content::WebContents* source) {
   Emit("unresponsive");
-  if (type_ == BROWSER_WINDOW)
+  if (type_ == BROWSER_WINDOW && owner_window())
     owner_window()->RendererUnresponsive(source);
 }
 
 void WebContents::RendererResponsive(content::WebContents* source) {
   Emit("responsive");
-  if (type_ == BROWSER_WINDOW)
+  if (type_ == BROWSER_WINDOW && owner_window())
     owner_window()->RendererResponsive(source);
 }
 

From 998ce73ad90c2af02e8eb3191bd5a99d5c1e1c26 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 21:56:47 +0900
Subject: [PATCH 244/510] Add webContents.id property

---
 atom/browser/api/atom_api_web_contents.cc | 5 +++++
 atom/browser/api/atom_api_web_contents.h  | 1 +
 docs/api/web-contents.md                  | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 6a254ab8b4e8..8e4653bee4b8 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -1174,6 +1174,10 @@ v8::Local<v8::Value> WebContents::GetOwnerBrowserWindow() {
     return v8::Null(isolate());
 }
 
+int32_t WebContents::ID() const {
+  return weak_map_id();
+}
+
 v8::Local<v8::Value> WebContents::Session(v8::Isolate* isolate) {
   return v8::Local<v8::Value>::New(isolate, session_);
 }
@@ -1266,6 +1270,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("_printToPDF", &WebContents::PrintToPDF)
       .SetMethod("addWorkSpace", &WebContents::AddWorkSpace)
       .SetMethod("removeWorkSpace", &WebContents::RemoveWorkSpace)
+      .SetProperty("id", &WebContents::ID)
       .SetProperty("session", &WebContents::Session)
       .SetProperty("hostWebContents", &WebContents::HostWebContents)
       .SetProperty("devToolsWebContents", &WebContents::DevToolsWebContents)
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index 9deb1696c411..81d97dfdde6c 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -154,6 +154,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   v8::Local<v8::Value> GetOwnerBrowserWindow();
 
   // Properties.
+  int32_t ID() const;
   v8::Local<v8::Value> Session(v8::Isolate* isolate);
   content::WebContents* HostWebContents();
   v8::Local<v8::Value> DevToolsWebContents(v8::Isolate* isolate);
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 7d42b8a48ab5..d0716305ab9f 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -913,6 +913,10 @@ win.webContents.on('did-finish-load', () => {
 
 `WebContents` objects also have the following properties:
 
+### `webContents.id`
+
+The unique ID of this WebContents.
+
 ### `webContents.session`
 
 Returns the [session](session.md) object used by this webContents.

From d6cb84f8a3b0626e9d674943e8e5fc3492a7d4e9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 17 May 2016 22:39:18 +0900
Subject: [PATCH 245/510] WebContents without owner window should always open
 detached devtools

---
 atom/browser/api/atom_api_web_contents.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 8e4653bee4b8..4cfbe6094f68 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -866,7 +866,7 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
     return;
 
   std::string state;
-  if (type_ == WEB_VIEW) {
+  if (type_ == WEB_VIEW || !owner_window()) {
     state = "detach";
   } else if (args && args->Length() == 1) {
     bool detach = false;

From dc9b3fcef7fd4abc0682783d1000c5363b42ac35 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 13:29:21 +0900
Subject: [PATCH 246/510] Remove WebViewGuestDelegate::HandleKeyboardEvent

---
 atom/browser/api/atom_api_web_contents.cc | 4 ++--
 atom/browser/web_view_guest_delegate.cc   | 7 -------
 atom/browser/web_view_guest_delegate.h    | 8 --------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 4cfbe6094f68..b5aa8e9aa64b 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -399,9 +399,9 @@ void WebContents::HandleKeyboardEvent(
     ExitFullscreenModeForTab(source);
   } else if (type_ == BROWSER_WINDOW && owner_window()) {
     owner_window()->HandleKeyboardEvent(source, event);
-  } else if (type_ == WEB_VIEW && guest_delegate_) {
+  } else if (type_ == WEB_VIEW && embedder_) {
     // Send the unhandled keyboard events back to the embedder.
-    guest_delegate_->HandleKeyboardEvent(source, event);
+    embedder_->HandleKeyboardEvent(source, event);
   }
 }
 
diff --git a/atom/browser/web_view_guest_delegate.cc b/atom/browser/web_view_guest_delegate.cc
index 6abb9713bfac..11f8219bf088 100644
--- a/atom/browser/web_view_guest_delegate.cc
+++ b/atom/browser/web_view_guest_delegate.cc
@@ -95,13 +95,6 @@ void WebViewGuestDelegate::SetSize(const SetSizeParams& params) {
   auto_size_enabled_ = enable_auto_size;
 }
 
-void WebViewGuestDelegate::HandleKeyboardEvent(
-    content::WebContents* source,
-    const content::NativeWebKeyboardEvent& event) {
-  if (embedder_web_contents_)
-    embedder_web_contents_->GetDelegate()->HandleKeyboardEvent(source, event);
-}
-
 void WebViewGuestDelegate::DidCommitProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
     const GURL& url, ui::PageTransition transition_type) {
diff --git a/atom/browser/web_view_guest_delegate.h b/atom/browser/web_view_guest_delegate.h
index 95888ff749fd..3dae1a1749b5 100644
--- a/atom/browser/web_view_guest_delegate.h
+++ b/atom/browser/web_view_guest_delegate.h
@@ -8,10 +8,6 @@
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 
-namespace content {
-struct NativeWebKeyboardEvent;
-}
-
 namespace atom {
 
 namespace api {
@@ -49,10 +45,6 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
   // and normal sizes.
   void SetSize(const SetSizeParams& params);
 
-  // Transfer the keyboard event to embedder.
-  void HandleKeyboardEvent(content::WebContents* source,
-                           const content::NativeWebKeyboardEvent& event);
-
  protected:
   // content::WebContentsObserver:
   void DidCommitProvisionalLoadForFrame(

From 5f6c468f0f806ff5977dab6943d8e00c2a53572c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 13:47:50 +0900
Subject: [PATCH 247/510] Handle keyboard events for WebContents that do not
 have owner window

---
 atom/browser/api/atom_api_web_contents.cc     | 10 ++---
 atom/browser/common_web_contents_delegate.cc  | 25 -----------
 atom/browser/common_web_contents_delegate.h   |  3 ++
 .../common_web_contents_delegate_mac.mm       | 39 ++++++++++++++++
 .../common_web_contents_delegate_views.cc     | 45 +++++++++++++++++++
 atom/browser/native_window_mac.h              |  5 ---
 atom/browser/native_window_mac.mm             | 22 ---------
 filenames.gypi                                |  2 +
 8 files changed, 93 insertions(+), 58 deletions(-)
 create mode 100644 atom/browser/common_web_contents_delegate_mac.mm
 create mode 100644 atom/browser/common_web_contents_delegate_views.cc

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index b5aa8e9aa64b..eac378b2a77f 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -394,14 +394,12 @@ bool WebContents::IsPopupOrPanel(const content::WebContents* source) const {
 void WebContents::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen()) {
-    // Escape exits tabbed fullscreen mode.
-    ExitFullscreenModeForTab(source);
-  } else if (type_ == BROWSER_WINDOW && owner_window()) {
-    owner_window()->HandleKeyboardEvent(source, event);
-  } else if (type_ == WEB_VIEW && embedder_) {
+  if (type_ == WEB_VIEW && embedder_) {
     // Send the unhandled keyboard events back to the embedder.
     embedder_->HandleKeyboardEvent(source, event);
+  } else {
+    // Go to the default keyboard handling.
+    CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
   }
 }
 
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index d4b3f187a209..ea2bf8677cba 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -31,14 +31,6 @@
 #include "content/public/browser/security_style_explanations.h"
 #include "storage/browser/fileapi/isolated_context.h"
 
-#if defined(TOOLKIT_VIEWS)
-#include "atom/browser/native_window_views.h"
-#endif
-
-#if defined(USE_X11)
-#include "atom/browser/browser.h"
-#endif
-
 using content::BrowserThread;
 using security_state::SecurityStateModel;
 
@@ -630,23 +622,6 @@ void CommonWebContentsDelegate::OnDevToolsSearchCompleted(
                                     &file_paths_value);
 }
 
-#if defined(TOOLKIT_VIEWS)
-gfx::ImageSkia CommonWebContentsDelegate::GetDevToolsWindowIcon() {
-  if (!owner_window())
-    return gfx::ImageSkia();
-  return static_cast<views::WidgetDelegate*>(static_cast<NativeWindowViews*>(
-      owner_window()))->GetWindowAppIcon();
-}
-#endif
-
-#if defined(USE_X11)
-void CommonWebContentsDelegate::GetDevToolsWindowWMClass(
-    std::string* name, std::string* class_name) {
-  *class_name = Browser::Get()->GetName();
-  *name = base::ToLowerASCII(*class_name);
-}
-#endif
-
 void CommonWebContentsDelegate::SetHtmlApiFullscreen(bool enter_fullscreen) {
   // Window is already in fullscreen mode, save the state.
   if (enter_fullscreen && owner_window_->IsFullscreen()) {
diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index 8ea04afebe24..095dad3bcebe 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -84,6 +84,9 @@ class CommonWebContentsDelegate
   content::SecurityStyle GetSecurityStyle(
       content::WebContents* web_contents,
       content::SecurityStyleExplanations* explanations) override;
+  void HandleKeyboardEvent(
+      content::WebContents* source,
+      const content::NativeWebKeyboardEvent& event) override;
 
   // brightray::InspectableWebContentsDelegate:
   void DevToolsSaveToFile(const std::string& url,
diff --git a/atom/browser/common_web_contents_delegate_mac.mm b/atom/browser/common_web_contents_delegate_mac.mm
new file mode 100644
index 000000000000..69117f190532
--- /dev/null
+++ b/atom/browser/common_web_contents_delegate_mac.mm
@@ -0,0 +1,39 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/common_web_contents_delegate.h"
+
+#import <Cocoa/Cocoa.h>
+
+#include "content/public/browser/native_web_keyboard_event.h"
+#include "ui/events/keycodes/keyboard_codes.h"
+
+namespace atom {
+
+void CommonWebContentsDelegate::HandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  if (event.skip_in_browser ||
+      event.type == content::NativeWebKeyboardEvent::Char)
+    return;
+
+  // Escape exits tabbed fullscreen mode.
+  if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen())
+    ExitFullscreenModeForTab(source);
+
+  BOOL handled = [[NSApp mainMenu] performKeyEquivalent:event.os_event];
+  if (!handled && event.os_event.window) {
+    // Handle the cmd+~ shortcut.
+    if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ &&
+        (event.os_event.keyCode == 50  /* ~ */)) {
+      if (event.os_event.modifierFlags & NSShiftKeyMask) {
+        [NSApp sendAction:@selector(_cycleWindowsReversed:) to:nil from:nil];
+      } else {
+        [NSApp sendAction:@selector(_cycleWindows:) to:nil from:nil];
+      }
+    }
+  }
+}
+
+}  // namespace atom
diff --git a/atom/browser/common_web_contents_delegate_views.cc b/atom/browser/common_web_contents_delegate_views.cc
new file mode 100644
index 000000000000..d70884c45c2a
--- /dev/null
+++ b/atom/browser/common_web_contents_delegate_views.cc
@@ -0,0 +1,45 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/common_web_contents_delegate.h"
+
+#include "atom/browser/native_window_views.h"
+#include "base/strings/string_util.h"
+#include "content/public/browser/native_web_keyboard_event.h"
+#include "ui/events/keycodes/keyboard_codes.h"
+
+#if defined(USE_X11)
+#include "atom/browser/browser.h"
+#endif
+
+namespace atom {
+
+void CommonWebContentsDelegate::HandleKeyboardEvent(
+    content::WebContents* source,
+    const content::NativeWebKeyboardEvent& event) {
+  // Escape exits tabbed fullscreen mode.
+  if (event.windowsKeyCode == ui::VKEY_ESCAPE && is_html_fullscreen())
+    ExitFullscreenModeForTab(source);
+
+  // Let the NativeWindow handle other parts.
+  if (owner_window())
+    owner_window()->HandleKeyboardEvent(source, event);
+}
+
+gfx::ImageSkia CommonWebContentsDelegate::GetDevToolsWindowIcon() {
+  if (!owner_window())
+    return gfx::ImageSkia();
+  return static_cast<views::WidgetDelegate*>(static_cast<NativeWindowViews*>(
+      owner_window()))->GetWindowAppIcon();
+}
+
+#if defined(USE_X11)
+void CommonWebContentsDelegate::GetDevToolsWindowWMClass(
+    std::string* name, std::string* class_name) {
+  *class_name = Browser::Get()->GetName();
+  *name = base::ToLowerASCII(*class_name);
+}
+#endif
+
+}  // namespace atom
diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index 22390f42dd0e..cfb3141ede66 100644
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -100,11 +100,6 @@ class NativeWindowMac : public NativeWindow {
   }
 
  protected:
-  // NativeWindow:
-  void HandleKeyboardEvent(
-      content::WebContents*,
-      const content::NativeWebKeyboardEvent&) override;
-
   // Return a vector of non-draggable regions that fill a window of size
   // |width| by |height|, but leave gaps where the window should be draggable.
   std::vector<gfx::Rect> CalculateNonDraggableRegions(
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 0f782d58516b..bfffc7a08d64 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -15,7 +15,6 @@
 #include "brightray/browser/inspectable_web_contents.h"
 #include "brightray/browser/inspectable_web_contents_view.h"
 #include "content/public/browser/browser_accessibility_state.h"
-#include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -935,27 +934,6 @@ bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
   return collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
 }
 
-void NativeWindowMac::HandleKeyboardEvent(
-    content::WebContents*,
-    const content::NativeWebKeyboardEvent& event) {
-  if (event.skip_in_browser ||
-      event.type == content::NativeWebKeyboardEvent::Char)
-    return;
-
-  BOOL handled = [[NSApp mainMenu] performKeyEquivalent:event.os_event];
-  if (!handled && event.os_event.window) {
-    // Handle the cmd+~ shortcut.
-    if ((event.os_event.modifierFlags & NSCommandKeyMask) /* cmd */ &&
-        (event.os_event.keyCode == 50  /* ~ */)) {
-      if (event.os_event.modifierFlags & NSShiftKeyMask) {
-        [NSApp sendAction:@selector(_cycleWindowsReversed:) to:nil from:nil];
-      } else {
-        [NSApp sendAction:@selector(_cycleWindows:) to:nil from:nil];
-      }
-    }
-  }
-}
-
 std::vector<gfx::Rect> NativeWindowMac::CalculateNonDraggableRegions(
     const std::vector<DraggableRegion>& regions, int width, int height) {
   std::vector<gfx::Rect> result;
diff --git a/filenames.gypi b/filenames.gypi
index f9bbe8f75f1b..cc33d9a81a67 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -171,6 +171,8 @@
       'atom/browser/browser_mac.mm',
       'atom/browser/browser_win.cc',
       'atom/browser/browser_observer.h',
+      'atom/browser/common_web_contents_delegate_mac.mm',
+      'atom/browser/common_web_contents_delegate_views.cc',
       'atom/browser/common_web_contents_delegate.cc',
       'atom/browser/common_web_contents_delegate.h',
       'atom/browser/javascript_environment.cc',

From 87c10b3ac2b3111f15e3429fc92f6565092d2c98 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 13:55:48 +0900
Subject: [PATCH 248/510] Make non-public module accesible via remote

---
 lib/renderer/api/remote.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index 01d777e8526f..617a1fe81a22 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -250,16 +250,13 @@ ipcRenderer.on('ELECTRON_RENDERER_RELEASE_CALLBACK', function (event, id) {
 const browserModules = require('../../browser/api/exports/electron')
 
 // And add a helper receiver for each one.
-var fn = function (name) {
-  return Object.defineProperty(exports, name, {
+for (let name of Object.getOwnPropertyNames(browserModules)) {
+  Object.defineProperty(exports, name, {
     get: function () {
       return exports.getBuiltin(name)
     }
   })
 }
-for (var name in browserModules) {
-  fn(name)
-}
 
 // Get remote module.
 exports.require = function (module) {

From 97250b53e870f3f24b63e2ade86d651c55762ea8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 14:40:19 +0900
Subject: [PATCH 249/510] Pass userInfo in subscribeNotification

---
 .../api/atom_api_system_preferences.cc        |  1 +
 .../browser/api/atom_api_system_preferences.h | 11 +++++++++-
 .../api/atom_api_system_preferences_mac.mm    | 20 +++++++++++++++----
 atom/browser/mac/dict_util.mm                 |  3 +++
 docs/api/system-preferences.md                | 12 +++++++----
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/atom/browser/api/atom_api_system_preferences.cc b/atom/browser/api/atom_api_system_preferences.cc
index b8c665456ade..2b11aad25278 100644
--- a/atom/browser/api/atom_api_system_preferences.cc
+++ b/atom/browser/api/atom_api_system_preferences.cc
@@ -5,6 +5,7 @@
 #include "atom/browser/api/atom_api_system_preferences.h"
 
 #include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_includes.h"
 #include "native_mate/dictionary.h"
 
diff --git a/atom/browser/api/atom_api_system_preferences.h b/atom/browser/api/atom_api_system_preferences.h
index fed1c52247b7..7779ce007816 100644
--- a/atom/browser/api/atom_api_system_preferences.h
+++ b/atom/browser/api/atom_api_system_preferences.h
@@ -11,6 +11,10 @@
 #include "base/callback.h"
 #include "native_mate/handle.h"
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace atom {
 
 namespace api {
@@ -22,11 +26,16 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences> {
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::ObjectTemplate> prototype);
 
+#if defined(OS_MACOSX)
+  using NotificationCallback = base::Callback<
+      void(const std::string&, const base::DictionaryValue&)>;
+#endif
+
 #if defined(OS_WIN)
   bool IsAeroGlassEnabled();
 #elif defined(OS_MACOSX)
   int SubscribeNotification(const std::string& name,
-                            const base::Closure& callback);
+                            const NotificationCallback& callback);
   void UnsubscribeNotification(int id);
   v8::Local<v8::Value> GetUserDefault(const std::string& name,
                                       const std::string& type);
diff --git a/atom/browser/api/atom_api_system_preferences_mac.mm b/atom/browser/api/atom_api_system_preferences_mac.mm
index 2d12b278ae92..1bc65a14f94b 100644
--- a/atom/browser/api/atom_api_system_preferences_mac.mm
+++ b/atom/browser/api/atom_api_system_preferences_mac.mm
@@ -8,8 +8,10 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "atom/browser/mac/dict_util.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/values.h"
 #include "net/base/mac/url_conversions.h"
 
 namespace atom {
@@ -25,16 +27,26 @@ std::map<int, id> g_id_map;
 
 }  // namespace
 
-int SystemPreferences::SubscribeNotification(const std::string& name,
-                                             const base::Closure& callback) {
+int SystemPreferences::SubscribeNotification(
+    const std::string& name, const NotificationCallback& callback) {
   int request_id = g_next_id++;
-  __block base::Closure copied_callback = callback;
+  __block NotificationCallback copied_callback = callback;
   g_id_map[request_id] = [[NSDistributedNotificationCenter defaultCenter]
       addObserverForName:base::SysUTF8ToNSString(name)
       object:nil
       queue:nil
       usingBlock:^(NSNotification* notification) {
-        copied_callback.Run();
+        scoped_ptr<base::DictionaryValue> user_info =
+            NSDictionaryToDictionaryValue(notification.userInfo);
+        if (user_info) {
+          copied_callback.Run(
+              base::SysNSStringToUTF8(notification.name),
+              *user_info);
+        } else {
+          copied_callback.Run(
+              base::SysNSStringToUTF8(notification.name),
+              base::DictionaryValue());
+        }
       }
   ];
   return request_id;
diff --git a/atom/browser/mac/dict_util.mm b/atom/browser/mac/dict_util.mm
index 6a98e4cfdaad..04837ebbae50 100644
--- a/atom/browser/mac/dict_util.mm
+++ b/atom/browser/mac/dict_util.mm
@@ -26,6 +26,9 @@ NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value)
 
 scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
     NSDictionary* dict) {
+  if (!dict)
+    return nullptr;
+
   NSData* data = [NSJSONSerialization dataWithJSONObject:dict
                                                  options:0
                                                    error:nil];
diff --git a/docs/api/system-preferences.md b/docs/api/system-preferences.md
index df7ef89e65c4..8f4dc8993852 100644
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -13,12 +13,16 @@ This method returns `true` if the system is in Dark Mode, and `false` otherwise.
 * `event` String
 * `callback` Function
 
-Subscribes to native notifications of OS X, `callback` will be called when the
-corresponding `event` happens. The `id` of the subscriber is returned, which can
-be used to unsubscribe the `event`.
+Subscribes to native notifications of OS X, `callback` will be called with
+`callback(event, userInfo)` when the corresponding `event` happens. The
+`userInfo` is an Object that contains the user information dictionary sent
+along with the notification.
+
+The `id` of the subscriber is returned, which can be used to unsubscribe the
+`event`.
 
 Under the hood this API subscribes to `NSDistributedNotificationCenter`,
-possible values of `event` are:
+example values of `event` are:
 
 * `AppleInterfaceThemeChangedNotification`
 * `AppleAquaColorVariantChanged`

From 240c346d0205ef54bdda803804b62f364147bba5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 14:50:12 +0900
Subject: [PATCH 250/510] Ignore invalid JSON object when converting
 NSDictionary

---
 atom/browser/mac/dict_util.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/mac/dict_util.mm b/atom/browser/mac/dict_util.mm
index 04837ebbae50..188909548eb3 100644
--- a/atom/browser/mac/dict_util.mm
+++ b/atom/browser/mac/dict_util.mm
@@ -26,7 +26,7 @@ NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value)
 
 scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
     NSDictionary* dict) {
-  if (!dict)
+  if (!dict || ![NSJSONSerialization isValidJSONObject:dict])
     return nullptr;
 
   NSData* data = [NSJSONSerialization dataWithJSONObject:dict

From 68cf267b1d6590af3cb6f4a08da33ec8ef6c3e5d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 15:49:33 +0900
Subject: [PATCH 251/510] Do not convert NSDictionary to JSON

---
 atom/browser/mac/dict_util.mm | 100 +++++++++++++++++++++++++++++-----
 1 file changed, 87 insertions(+), 13 deletions(-)

diff --git a/atom/browser/mac/dict_util.mm b/atom/browser/mac/dict_util.mm
index 188909548eb3..f880cdae0e96 100644
--- a/atom/browser/mac/dict_util.mm
+++ b/atom/browser/mac/dict_util.mm
@@ -4,13 +4,55 @@
 
 #include "atom/browser/mac/dict_util.h"
 
-#include "base/mac/scoped_nsobject.h"
-#include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
+#include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 
 namespace atom {
 
+namespace {
+
+scoped_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
+  if (!arr)
+    return nullptr;
+
+  scoped_ptr<base::ListValue> result(new base::ListValue);
+  for (id value in arr) {
+    if ([value isKindOfClass:[NSString class]]) {
+      result->AppendString(base::SysNSStringToUTF8(value));
+    } else if ([value isKindOfClass:[NSNumber class]]) {
+      const char* objc_type = [value objCType];
+      if (strcmp(objc_type, @encode(BOOL)) == 0 ||
+          strcmp(objc_type, @encode(char)) == 0)
+        result->AppendBoolean([value boolValue]);
+      else if (strcmp(objc_type, @encode(double)) == 0 ||
+               strcmp(objc_type, @encode(float)) == 0)
+        result->AppendDouble([value doubleValue]);
+      else
+        result->AppendInteger([value intValue]);
+    } else if ([value isKindOfClass:[NSArray class]]) {
+      scoped_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
+      if (sub_arr)
+        result->Append(std::move(sub_arr));
+      else
+        result->Append(base::Value::CreateNullValue());
+    } else if ([value isKindOfClass:[NSDictionary class]]) {
+      scoped_ptr<base::DictionaryValue> sub_dict =
+          NSDictionaryToDictionaryValue(value);
+      if (sub_dict)
+        result->Append(std::move(sub_dict));
+      else
+        result->Append(base::Value::CreateNullValue());
+    } else {
+      result->Append(base::Value::CreateNullValue());
+    }
+  }
+
+  return result;
+}
+
+}  // namespace
+
 NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value) {
   std::string json;
   if (!base::JSONWriter::Write(value, &json))
@@ -26,20 +68,52 @@ NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value)
 
 scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
     NSDictionary* dict) {
-  if (!dict || ![NSJSONSerialization isValidJSONObject:dict])
+  if (!dict)
     return nullptr;
 
-  NSData* data = [NSJSONSerialization dataWithJSONObject:dict
-                                                 options:0
-                                                   error:nil];
-  if (!data)
-    return nullptr;
+  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
+  for (id key in dict) {
+    std::string str_key;
+    if ([key isKindOfClass:[NSString class]])
+      str_key = base::SysNSStringToUTF8(key);
+    else
+      str_key = base::SysNSStringToUTF8([NSString stringWithFormat:@"%p", key]);
 
-  base::scoped_nsobject<NSString> json =
-      [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  scoped_ptr<base::Value> value =
-      base::JSONReader::Read([json UTF8String]);
-  return base::DictionaryValue::From(std::move(value));
+    id value = [dict objectForKey:key];
+    if ([value isKindOfClass:[NSString class]]) {
+      result->SetStringWithoutPathExpansion(
+          str_key, base::SysNSStringToUTF8(value));
+    } else if ([value isKindOfClass:[NSNumber class]]) {
+      const char* objc_type = [value objCType];
+      if (strcmp(objc_type, @encode(BOOL)) == 0 ||
+          strcmp(objc_type, @encode(char)) == 0)
+        result->SetBooleanWithoutPathExpansion(str_key, [value boolValue]);
+      else if (strcmp(objc_type, @encode(double)) == 0 ||
+               strcmp(objc_type, @encode(float)) == 0)
+        result->SetDoubleWithoutPathExpansion(str_key, [value doubleValue]);
+      else
+        result->SetIntegerWithoutPathExpansion(str_key, [value intValue]);
+    } else if ([value isKindOfClass:[NSArray class]]) {
+      scoped_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
+      if (sub_arr)
+        result->SetWithoutPathExpansion(str_key, std::move(sub_arr));
+      else
+        result->SetWithoutPathExpansion(str_key,
+                                        base::Value::CreateNullValue());
+    } else if ([value isKindOfClass:[NSDictionary class]]) {
+      scoped_ptr<base::DictionaryValue> sub_dict =
+          NSDictionaryToDictionaryValue(value);
+      if (sub_dict)
+        result->SetWithoutPathExpansion(str_key, std::move(sub_dict));
+      else
+        result->SetWithoutPathExpansion(str_key,
+                                        base::Value::CreateNullValue());
+    } else {
+      result->SetWithoutPathExpansion(str_key, base::Value::CreateNullValue());
+    }
+  }
+
+  return result;
 }
 
 }  // namespace atom

From 3d0b98c9caef5fce1c98d9c634115348b2d74158 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 16:01:08 +0900
Subject: [PATCH 252/510] Use string description for unknown types

---
 atom/browser/mac/dict_util.mm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/atom/browser/mac/dict_util.mm b/atom/browser/mac/dict_util.mm
index f880cdae0e96..1fb8401a2a23 100644
--- a/atom/browser/mac/dict_util.mm
+++ b/atom/browser/mac/dict_util.mm
@@ -44,7 +44,7 @@ scoped_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
       else
         result->Append(base::Value::CreateNullValue());
     } else {
-      result->Append(base::Value::CreateNullValue());
+      result->AppendString(base::SysNSStringToUTF8([value description]));
     }
   }
 
@@ -73,11 +73,8 @@ scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
 
   scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
   for (id key in dict) {
-    std::string str_key;
-    if ([key isKindOfClass:[NSString class]])
-      str_key = base::SysNSStringToUTF8(key);
-    else
-      str_key = base::SysNSStringToUTF8([NSString stringWithFormat:@"%p", key]);
+    std::string str_key = base::SysNSStringToUTF8(
+        [key isKindOfClass:[NSString class]] ? key : [key description]);
 
     id value = [dict objectForKey:key];
     if ([value isKindOfClass:[NSString class]]) {
@@ -109,7 +106,9 @@ scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
         result->SetWithoutPathExpansion(str_key,
                                         base::Value::CreateNullValue());
     } else {
-      result->SetWithoutPathExpansion(str_key, base::Value::CreateNullValue());
+      result->SetStringWithoutPathExpansion(
+          str_key,
+          base::SysNSStringToUTF8([value description]));
     }
   }
 

From d7fdb16078bf5ea1d7813a13376fbf5ee0fccbf1 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Wed, 18 May 2016 16:41:21 +0900
Subject: [PATCH 253/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/api/web-contents.md   | 88 +++++++++++++++----
 docs-translations/ko-KR/api/web-frame.md      | 36 ++++++++
 docs-translations/ko-KR/tutorial/security.md  | 23 +++--
 .../tutorial/using-selenium-and-webdriver.md  | 49 ++++++++++-
 4 files changed, 166 insertions(+), 30 deletions(-)

diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index d0d7bd43b4b9..d75c7911b668 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -8,7 +8,7 @@
 접근하는 예시입니다:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
+const {BrowserWindow} = require('electron');
 
 let win = new BrowserWindow({width: 800, height: 1500});
 win.loadURL('http://github.com');
@@ -37,8 +37,9 @@ Returns:
 
 이 이벤트는 `did-finish-load`와 비슷하나, 로드가 실패했거나 취소되었을 때 발생합니다.
 예를 들면 `window.stop()`이 실행되었을 때 발생합니다. 발생할 수 있는 전체 에러 코드의
-목록과 설명은 [여기](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h)서
-확인할 수 있습니다.
+목록과 설명은 [여기서](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h)
+확인할 수 있습니다. 참고로 리다이렉트 응답은 `errorCode` -3과 함께 발생합니다; 이
+에러는 명시적으로 무시할 수 있습니다.
 
 ### Event: 'did-frame-finish-load'
 
@@ -225,7 +226,7 @@ Returns:
   * `issuerName` String - 인증서 발급자 이름
 * `callback` Function
 
-클라이언트 인증이 요청되었을 때 발생하는 이벤트 입니다.
+클라이언트 인증이 요청되었을 때 발생하는 이벤트입니다.
 
 사용법은 [`app`의 `select-client-certificate` 이벤트](app.md#event-select-client-certificate)와
 같습니다.
@@ -292,7 +293,7 @@ Returns:
 * `image` NativeImage (optional)
 * `scale` Float (optional)
 
-커서 타입이 변경될 때 발생하는 이벤트입니다. `type` 매개변수는 다음 값이 될 수 있습니다:
+커서 종류가 변경될 때 발생하는 이벤트입니다. `type` 인수는 다음 값이 될 수 있습니다:
 `default`, `crosshair`, `pointer`, `text`, `wait`, `help`, `e-resize`, `n-resize`,
 `ne-resize`, `nw-resize`, `s-resize`, `se-resize`, `sw-resize`, `w-resize`,
 `ns-resize`, `ew-resize`, `nesw-resize`, `nwse-resize`, `col-resize`,
@@ -301,10 +302,64 @@ Returns:
 `cell`, `context-menu`, `alias`, `progress`, `nodrop`, `copy`, `none`,
 `not-allowed`, `zoom-in`, `zoom-out`, `grab`, `grabbing`, `custom`.
 
-만약 `type` 매개변수가 `custom` 이고 `image` 매개변수가 `NativeImage`를 통한 커스텀
-커서를 지정했을 때, 해당 이미지로 커서가 변경됩니다. 또한 `scale` 매개변수는 이미지의
+만약 `type` 인수가 `custom` 이고 `image` 인수가 `NativeImage`를 통한 커스텀
+커서를 지정했을 때, 해당 이미지로 커서가 변경됩니다. 또한 `scale` 인수는 이미지의
 크기를 조정합니다.
 
+### Event: 'context-menu'
+
+Returns:
+
+* `event` Event
+* `params` Object
+  * `x` Integer - x 좌표
+  * `y` Integer - y 좌표
+  * `linkURL` String - 컨텍스트 메뉴가 호출된 노드를 둘러싸는 링크의 URL.
+  * `linkText` String - 링크에 연관된 텍스트. 콘텐츠의 링크가 이미지인 경우 빈
+    문자열이 됩니다.
+  * `pageURL` String - 컨텍스트 메뉴가 호출된 상위 수준 페이지의 URL.
+  * `frameURL` String - 컨텍스트 메뉴가 호출된 서브 프레임의 URL.
+  * `srcURL` String - 컨텍스트 메뉴가 호출된 요소에 대한 소스 URL. 요소와 소스 URL은
+    이미지, 오디오, 비디오입니다.
+  * `mediaType` String - 컨텍스트 메뉴가 호출된 노드의 종류. 값은 `none`, `image`,
+    `audio`, `video`, `canvas`, `file` 또는 `plugin`이 될 수 있습니다.
+  * `hasImageContent` Boolean - 컨텍스트 메뉴가 내용이 있는 이미지에서 호출되었는지
+    여부.
+  * `isEditable` Boolean - 컨텍스트를 편집할 수 있는지 여부.
+  * `selectionText` String - 컨텍스트 메뉴가 호출된 부분에 있는 선택된 텍스트.
+  * `titleText` String - 컨텍스트 메뉴가 호출된 선택된 제목 또는 알림 텍스트.
+  * `misspelledWord` String - 만약 있는 경우, 커서가 가르키는 곳에서 발생한 오타.
+  * `frameCharset` String - 메뉴가 호출된 프레임의 문자열 인코딩.
+  * `inputFieldType` String - 컨텍스트 메뉴가 입력 필드에서 호출되었을 때, 그 필드의
+    종류. 값은 `none`, `plainText`, `password`, `other` 중 한 가지가 될 수 있습니다.
+  * `menuSourceType` String - 컨텍스트 메뉴를 호출한 입력 소스. 값은 `none`,
+    `mouse`, `keyboard`, `touch`, `touchMenu` 중 한 가지가 될 수 있습니다.
+  * `mediaFlags` Object - 컨텍스트 메뉴가 호출된 미디어 요소에 대한 플래그. 자세한
+    사항은 아래를 참고하세요.
+  * `editFlags` Object - 이 플래그는 렌더러가 어떤 행동을 이행할 수 있는지 여부를
+    표시합니다. 자세한 사항은 아래를 참고하세요.
+
+`mediaFlags`는 다음과 같은 속성을 가지고 있습니다:
+  * `inError` Boolean - 미디어 객체가 크래시되었는지 여부.
+  * `isPaused` Boolean - 미디어 객체가 일시중지되었는지 여부.
+  * `isMuted` Boolean - 미디어 객체가 음소거되었는지 여부.
+  * `hasAudio` Boolean - 미디어 객체가 오디오를 가지고 있는지 여부.
+  * `isLooping` Boolean - 미디어 객체가 루프중인지 여부.
+  * `isControlsVisible` Boolean - 미디어 객체의 컨트롤이 보이는지 여부.
+  * `canToggleControls` Boolean - 미디어 객체의 컨트롤을 토글할 수 있는지 여부.
+  * `canRotate` Boolean - 미디어 객체를 돌릴 수 있는지 여부.
+
+`editFlags`는 다음과 같은 속성을 가지고 있습니다:
+  * `canUndo` Boolean - 렌더러에서 실행 취소할 수 있는지 여부.
+  * `canRedo` Boolean - 렌더러에서 다시 실행할 수 있는지 여부.
+  * `canCut` Boolean - 렌더러에서 잘라내기를 실행할 수 있는지 여부.
+  * `canCopy` Boolean - 렌더러에서 복사를 실행할 수 있는지 여부.
+  * `canPaste` Boolean - 렌더러에서 붙여넣기를 실행할 수 있는지 여부.
+  * `canDelete` Boolean - 렌더러에서 삭제를 실행할 수 있는지 여부.
+  * `canSelectAll` Boolean - 렌더러에서 모두 선택을 실행할 수 있는지 여부.
+
+새로운 컨텍스트 메뉴의 제어가 필요할 때 발생하는 이벤트입니다.
+
 ## Instance Methods
 
 `webContents`객체는 다음과 같은 인스턴스 메서드들을 가지고 있습니다.
@@ -604,14 +659,14 @@ Chromium의 미리보기 프린팅 커스텀 설정을 이용하여 윈도우의
 ```
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
+const {BrowserWindow} = require('electron');
 const fs = require('fs');
 
 let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('http://github.com');
 
 win.webContents.on('did-finish-load', () => {
-  // Use default printing options
+  // 기본 프린트 옵션을 사용합니다
   win.webContents.printToPDF({}, (error, data) => {
     if (error) throw error;
     fs.writeFile('/tmp/print.pdf', data, (error) => {
@@ -648,7 +703,7 @@ win.webContents.on('devtools-opened', () => {
   * `detach` Boolean - 새 창에서 개발자 도구를 엽니다.
   * `mode` String - 개발자 도구 표시 상태를 지정합니다. 옵션은 "right", "bottom",
     "undocked", "detach"가 될 수 있습니다. 기본값은 마지막 표시 상태를
-    사용합니다. `undocked` 모드에선 다시 독을 할 수 있습니다. 하지만 `detach`
+    사용합니다. `undocked` 모드에선 다시 도킹할 수 있습니다. 하지만 `detach`
     모드에선 할 수 없습니다.
 
 개발자 도구를 엽니다.
@@ -674,7 +729,7 @@ win.webContents.on('devtools-opened', () => {
 * `x` Integer
 * `y` Integer
 
-(`x`, `y`)위치의 엘레먼트를 조사합니다.
+(`x`, `y`)위치의 요소를 조사합니다.
 
 ### `webContents.inspectServiceWorker()`
 
@@ -712,7 +767,7 @@ app.on('ready', () => {
 <body>
   <script>
     require('electron').ipcRenderer.on('ping', (event, message) => {
-      console.log(message);  // Prints "whoooooooh!"
+      console.log(message);  // "whoooooooh!" 출력
     });
   </script>
 </body>
@@ -759,7 +814,7 @@ app.on('ready', () => {
 ### `webContents.sendInputEvent(event)`
 
 * `event` Object
-  * `type` String (**required**) - 이벤트의 타입. 다음 값들을 사용할 수 있습니다:
+  * `type` String (**required**) - 이벤트의 종류. 다음 값들을 사용할 수 있습니다:
     `mouseDown`,     `mouseUp`, `mouseEnter`, `mouseLeave`, `contextMenu`,
     `mouseWheel`, `mouseMove`, `keyDown`, `keyUp`, `char`.
   * `modifiers` Array - 이벤트의 수정자(modifier)들에 대한 배열. 다음 값들을 포함
@@ -816,7 +871,7 @@ Input `event`를 웹 페이지로 전송합니다.
 ### `webContents.savePage(fullPath, saveType, callback)`
 
 * `fullPath` String - 전체 파일 경로.
-* `saveType` String - 저장 타입을 지정합니다.
+* `saveType` String - 저장 종류를 지정합니다.
   * `HTMLOnly` - 페이지의 HTML만 저장합니다.
   * `HTMLComplete` - 페이지의 완성된 HTML을 저장합니다.
   * `MHTML` - 페이지의 완성된 HTML을 MHTML로 저장합니다.
@@ -898,7 +953,7 @@ win.webContents.debugger.sendCommand('Network.enable');
 
 * `method` String - 메서드 이름, 반드시 원격 디버깅 프로토콜에 의해 정의된 메서드중
   하나가 됩니다.
-* `commandParams` Object (optional) - 요청 매개변수를 표현한 JSON 객체.
+* `commandParams` Object (optional) - 요청 인수를 표현한 JSON 객체.
 * `callback` Function (optional) - 응답
   * `error` Object -  커맨드의 실패를 표시하는 에러 메시지.
   * `result` Object - 원격 디버깅 프로토콜에서 커맨드 설명의 'returns' 속성에 의해
@@ -918,8 +973,7 @@ win.webContents.debugger.sendCommand('Network.enable');
 
 * `event` Event
 * `method` String - 메서드 이름.
-* `params` Object - 원격 디버깅 프로토콜의 'parameters' 속성에서 정의된 이벤트
-  매개변수
+* `params` Object - 원격 디버깅 프로토콜의 'parameters' 속성에서 정의된 이벤트 인수
 
 디버깅 타겟이 관련 이벤트를 발생시킬 때 마다 발생하는 이벤트입니다.
 
diff --git a/docs-translations/ko-KR/api/web-frame.md b/docs-translations/ko-KR/api/web-frame.md
index 69e563df3f59..fdc68d222313 100644
--- a/docs-translations/ko-KR/api/web-frame.md
+++ b/docs-translations/ko-KR/api/web-frame.md
@@ -103,4 +103,40 @@ ServiceWorker의 등록과 fetch API를 사용할 수 있도록 지원합니다.
 브라우저 윈도우에서 어떤 `requestFullScreen` 같은 HTML API는 사용자의 승인이
 필요합니다. `userGesture`를 `true`로 설정하면 이러한 제약을 제거할 수 있습니다.
 
+### `webFrame.getResourceUsage()`
+
+Blink의 내부 메모리 캐시 사용 정보를 담고있는 객체를 반환합니다.
+
+```javascript
+console.log(webFrame.getResourceUsage())
+```
+
+다음이 출력됩니다:
+
+```javascript
+{
+  images: {
+    count: 22,
+    size: 2549,
+    liveSize: 2542,
+    decodedSize: 478,
+    purgedSize: 0,
+    purgeableSize: 0
+  },
+  cssStyleSheets: { /* same with "images" */ },
+  xslStyleSheets: { /* same with "images" */ },
+  fonts: { /* same with "images" */ },
+  other: { /* same with "images" */ },
+}
+```
+
+### `webFrame.clearCache()`
+
+사용하지 않는 메모리 비우기를 시도합니다. (이전 페이지의 이미지 등)
+
+참고로 맹목적으로 이 메서드를 호출하는 것은 이 빈 캐시를 다시 채워야하기 때문에
+Electron을 느리게 만듭니다. 따라서 이 메서드는 페이지가 예상했던 것 보다 실질적으로 더
+적은 메모리를 사용하게 만드는 어플리케이션 이벤트가 발생했을 때만 호출해야 합니다.
+(i.e. 아주 무거운 페이지에서 거의 빈 페이지로 이동한 후 계속 유지할 경우)
+
 [spellchecker]: https://github.com/atom/node-spellchecker
diff --git a/docs-translations/ko-KR/tutorial/security.md b/docs-translations/ko-KR/tutorial/security.md
index 2466efe65ac3..5d16d86ed6ec 100644
--- a/docs-translations/ko-KR/tutorial/security.md
+++ b/docs-translations/ko-KR/tutorial/security.md
@@ -1,16 +1,17 @@
 # 보안, 네이티브 호환성, 그리고 신뢰성
 
 웹 개발자로써, 우리는 일반적으로 브라우저의 강력한 웹 보안을 잘 이용해왔습니다 - 작성한
-코드에 관련된 보안 문제는 아주 적었습니다. 웹 사이트에 대해 상당히 제한된 권한과 기능에
-의존해왔습니다 - 그리고 사용자들이 새로운 보안 위협에 대해 발 빠르게 대응할 수 있는
-아주 커다란 팀의 엔지니어들에 의해 만들어진 브라우저를 마음 놓고 즐길 것이라고
-믿어왔습니다.
+코드에 관련된 보안 문제는 아주 적었습니다. 우리는 웹 사이트의 샌드박스안에서 허용된
+상당히 제한된 권한과 기능에 의존해왔으며, 우리는 새로운 보안 위협에 대해 발 빠르게
+대응할 수 있는 엔지니어들로 이루어진 커다란 팀으로부터 만들어진 브라우저를 사용자들이
+마음 놓고 즐길 것이라고 믿어왔습니다.
 
-하지만 Electron을 사용하여 작업한다면, Electron은 웹 브라우저가 아니라는 것을 이해하는
-것이 중요합니다. Electron은 웹 기술을 사용하여 강력한 데스크톱 어플리케이션을 만들 수
-있도록 해줍니다. 가장 핵심 기능은 바로 제한된 웹 사이트의 기능을 커버할 정도로 완전한
-네이티브 어플리케이션과 동일한 기능을 하는 강력한 소프트웨어를 만들 수 있는 능력입니다.
-하지만 코드에 부여된 추가적인 기능만큼 고유한 보안 문제가 발생할 수 있습니다.
+하지만 Electron을 사용하여 작업한다면, Electron은 웹 브라우저가 아니라는 것을 기억해
+두어야 합니다. Electron은 친근한 웹 기술을 사용하여 풍부한 기능의 데스크톱
+어플리케이션을 만들 수 있도록 해주지만 그만큼 코드가 더 큰 힘을 사용합니다.
+JavaScript가 파일 시스템, 유저 쉘, 그외 여러가지 기능에 접근할 수 있습니다. 이러한
+능력은 높은 퀄리티를 가진 네이티브 어플리케이션을 개발할 수 있도록 해주지만 코드에
+부여된 추가적인 기능만큼 고유한 보안 문제가 발생할 가능성이 있습니다.
 
 이를 염두해두고, 신뢰할 수 없는 출처의 임의의 콘텐츠를 표시할 때 Electron에서
 자체적으로 처리하지 않는 심각한 보안 문제를 야기할 수 있다는 점을 주의해야 합니다.
@@ -55,6 +56,10 @@ request와 기여는 언제나 환영합니다.
   (`webPreferences` 사용)
 * `webSecurity`를 비활성화하지 않습니다. 이 옵션을 비활성화하면 동일-출처 정책도
   비활성화됩니다.
+* [`Content-Security-Policy`](http://www.html5rocks.com/en/tutorials/security/content-security-policy/)
+  를 정의하고, 한정적인 규칙을 사용하세요 (ie: `script-src 'self'`)
+* 문자열을 코드로 실행할 수 있는
+  [`eval`을 덮어쓰고 비활성화](https://github.com/nylas/N1/blob/0abc5d5defcdb057120d726b271933425b75b415/static/index.js#L6)하세요.
 * `allowDisplayingInsecureContent`를 `true`로 설정하지 마세요.
 * `allowRunningInsecureContent`를 `true`로 설정하지 마세요.
 * 무엇을 하고 있는지 확실히 알고 있지않는 이상 `experimentalFeatures` 또는
diff --git a/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md b/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
index baa5dd719f60..e4d333c44e05 100644
--- a/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
+++ b/docs-translations/ko-KR/tutorial/using-selenium-and-webdriver.md
@@ -7,8 +7,46 @@
 > 등의 작업을 수행할 수 있습니다. ChromeDriver는 Chromium의 WebDriver wire 프로토콜
 > 스텐드얼론 서버 구현입니다. Chromium 과 WebDriver 팀 멤버에 의해 개발되었습니다.
 
-Electron에서 `chromedriver`를 사옹하려면 드라이버에서 Electron을 찾을 수 있도록 해야
-하며 Electron은 Chrome 브라우저와 비슷하다는 점을 기억해야 합니다.
+## Spectron 설정하기
+
+[Spectron][spectron]은 공식적으로 지원하는 Electron을 위한 ChromeDriver 테스팅
+프레임워크입니다. 이는 [WebdriverIO](http://webdriver.io/)를 기반으로 만들어졌고,
+테스트에서 Electron API에 접근하기 위한 헬퍼를 가지고 있으며 ChromeDriver를 포함하고
+있습니다.
+
+```bash
+$ npm install --save-dev spectron
+```
+
+```js
+// 윈도우가 제목과 함께 보이는지 검증하는 간단한 테스트.
+var Application = require('spectron').Application
+var assert = require('assert')
+
+var app = new Application({
+  path: '/Applications/MyApp.app/Contents/MacOS/MyApp'
+})
+
+app.start().then(function () {
+  // 윈도우가 보이는지 확인합니다.
+  return app.browserWindow.isVisible()
+}).then(function (isVisible) {
+  // 윈도우가 보이는지 검증합니다.
+  assert.equal(isVisible, true)
+}).then(function () {
+  // 윈도우의 제목을 가져옵니다.
+  return app.client.getTitle()
+}).then(function (title) {
+  // 윈도우의 제목을 검증합니다.
+  assert.equal(title, 'My App')
+}).then(function () {
+  // 어플리케이션을 중지합니다.
+  return app.stop()
+}).catch(function (error) {
+  // 테스트의 실패가 있다면 로깅합니다.
+  console.error('Test failed', error.message)
+})
+```
 
 ## WebDriverJs 설정하기
 
@@ -20,7 +58,8 @@ Electron에서 `chromedriver`를 사옹하려면 드라이버에서 Electron을
 먼저, `chromedriver` 바이너리를 다운로드 받고 실행합니다:
 
 ```bash
-$ ./chromedriver
+$ npm install electron-chromedriver
+$ ./node_modules/.bin/chromedriver
 Starting ChromeDriver (v2.10.291558) on port 9515
 Only local connections are allowed.
 ```
@@ -76,7 +115,8 @@ node 패키지입니다.
 먼저, `chromedriver` 바이너리를 다운로드 받고 실행합니다:
 
 ```bash
-$ chromedriver --url-base=wd/hub --port=9515
+$ npm install electron-chromedriver
+$ ./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515
 Starting ChromeDriver (v2.10.291558) on port 9515
 Only local connections are allowed.
 ```
@@ -127,3 +167,4 @@ client
 디렉터리로 복사하는 불필요한 과정을 생략할 수 있습니다.
 
 [chrome-driver]: https://sites.google.com/a/chromium.org/chromedriver/
+[spectron]: http://electron.atom.io/spectron

From deddf9853388dbd707946c380805a21322431f78 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 16:42:26 +0900
Subject: [PATCH 254/510] Currently set base bundle ID

---
 atom/app/atom_main_delegate.cc     | 4 ++++
 atom/app/atom_main_delegate.h      | 4 ++++
 atom/app/atom_main_delegate_mac.mm | 8 ++++++++
 3 files changed, 16 insertions(+)

diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
index 0a298308ad0b..655ccce2e35b 100644
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -83,6 +83,10 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 
   chrome::RegisterPathProvider();
 
+#if defined(OS_MACOSX)
+  SetUpBundleOverrides();
+#endif
+
   return brightray::MainDelegate::BasicStartupComplete(exit_code);
 }
 
diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h
index 5f4369302f5f..8f2976a9cd1b 100644
--- a/atom/app/atom_main_delegate.h
+++ b/atom/app/atom_main_delegate.h
@@ -31,6 +31,10 @@ class AtomMainDelegate : public brightray::MainDelegate {
 #endif
 
  private:
+#if defined(OS_MACOSX)
+  void SetUpBundleOverrides();
+#endif
+
   brightray::ContentClient content_client_;
   scoped_ptr<content::ContentBrowserClient> browser_client_;
   scoped_ptr<content::ContentRendererClient> renderer_client_;
diff --git a/atom/app/atom_main_delegate_mac.mm b/atom/app/atom_main_delegate_mac.mm
index 33a8dea4aabb..b26d5f46f644 100644
--- a/atom/app/atom_main_delegate_mac.mm
+++ b/atom/app/atom_main_delegate_mac.mm
@@ -7,6 +7,8 @@
 #include "base/mac/bundle_locations.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/mac/foundation_util.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "brightray/common/application_info.h"
 #include "brightray/common/mac/main_application_bundle.h"
@@ -48,4 +50,10 @@ void AtomMainDelegate::OverrideChildProcessPath() {
   PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
 }
 
+void AtomMainDelegate::SetUpBundleOverrides() {
+  base::mac::ScopedNSAutoreleasePool pool;
+  NSBundle* base_bundle = brightray::MainApplicationBundle();
+  base::mac::SetBaseBundleID([[base_bundle bundleIdentifier] UTF8String]);
+}
+
 }  // namespace atom

From 906948218f151b0f4bd1b2afb2618e8c64fc4f27 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 16:48:22 +0900
Subject: [PATCH 255/510] docs: Update MAS guide without using
 temporary-exception

---
 .../mac-app-store-submission-guide.md         | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/docs/tutorial/mac-app-store-submission-guide.md b/docs/tutorial/mac-app-store-submission-guide.md
index 15b6142b57a9..75ebb0776581 100644
--- a/docs/tutorial/mac-app-store-submission-guide.md
+++ b/docs/tutorial/mac-app-store-submission-guide.md
@@ -52,12 +52,17 @@ First, you need to prepare two entitlements files.
   <dict>
     <key>com.apple.security.app-sandbox</key>
     <true/>
-    <key>com.apple.security.temporary-exception.sbpl</key>
-    <string>(allow mach-lookup (global-name-regex #"^org.chromium.Chromium.rohitfork.[0-9]+$"))</string>
+    <key>com.apple.security.application-groups</key>
+    <array>
+      <string>your.bundle.id</string>
+    </array>
   </dict>
 </plist>
 ```
 
+_You have to replace `your.bundle.id` with the Bundle ID specified in your app's
+`Info.plist`._
+
 And then sign your app with the following script:
 
 ```bash
@@ -101,23 +106,6 @@ After signing your app, you can use Application Loader to upload it to iTunes
 Connect for processing, making sure you have [created a record][create-record]
 before uploading.
 
-### Explain the Usages of `temporary-exception`
-
-When sandboxing your app there was a `temporary-exception` entry added to the
-entitlements, according to the [App Sandbox Temporary Exception
-Entitlements][temporary-exception] documentation, you have to explain why this
-entry is needed:
-
-> Note: If you request a temporary-exception entitlement, be sure to follow the
-guidance regarding entitlements provided on the iTunes Connect website. In
-particular, identify the entitlement and corresponding issue number in the App
-Sandbox Entitlement Usage Information section in iTunes Connect and explain why
-your app needs the exception.
-
-You may explain that your app is built upon Chromium browser, which uses Mach
-port for its multi-process architecture. But there is still probability that
-your app failed the review because of this.
-
 ### Submit Your App for Review
 
 After these steps, you can [submit your app for review][submit-for-review].

From 962ce6c44cef5aa5061f5bd5f87e58120ce44fcc Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Wed, 18 May 2016 22:30:11 +0900
Subject: [PATCH 256/510] Japanese manual: add electron-versioning.

electron-versioning.md is translated.
Other tutorial files are updated.
[ci skip]
---
 docs-translations/jp/README.md                |  1 +
 .../jp/tutorial/application-distribution.md   |  2 +-
 .../jp/tutorial/application-packaging.md      | 10 ++--
 .../jp/tutorial/devtools-extension.md         |  8 +--
 .../jp/tutorial/electron-versioning.md        | 11 ++++
 .../mac-app-store-submission-guide.md         | 15 +++---
 .../jp/tutorial/using-pepper-flash-plugin.md  |  9 +++-
 .../tutorial/using-selenium-and-webdriver.md  | 52 ++++++++++++++++---
 .../jp/tutorial/using-widevine-cdm-plugin.md  | 12 ++---
 9 files changed, 87 insertions(+), 33 deletions(-)
 create mode 100644 docs-translations/jp/tutorial/electron-versioning.md

diff --git a/docs-translations/jp/README.md b/docs-translations/jp/README.md
index 87958a5346ad..5b3802e93d66 100644
--- a/docs-translations/jp/README.md
+++ b/docs-translations/jp/README.md
@@ -14,6 +14,7 @@ _リンクになっていないリストは未翻訳のものです。_
 
 * [サポートするプラットフォーム](tutorial/supported-platforms.md)
 * [セキュリティ](tutorial/security.md)
+* [Electronのバージョン管理](tutorial/electron-versioning.md)
 * [アプリケーションの配布](tutorial/application-distribution.md)
 * [Mac App Store 提出ガイド](tutorial/mac-app-store-submission-guide.md)
 * Windows Store Guide (tutorial/windows-store-guide.md)
diff --git a/docs-translations/jp/tutorial/application-distribution.md b/docs-translations/jp/tutorial/application-distribution.md
index f05b098514b9..19cc42979e13 100644
--- a/docs-translations/jp/tutorial/application-distribution.md
+++ b/docs-translations/jp/tutorial/application-distribution.md
@@ -25,7 +25,7 @@ electron/resources/app
 
 ## ファイルにアプリケーションをパッケージングする
 
-すべてのソースコードをコピーすることでアプリケーションを提供する方法とは別に、アプリケーションのソースコードをユーザーに見えるのを避けるために、[asar](https://github.com/atom/asar) にアーカイブしてアプリケーションをパッケージ化することができます。
+すべてのソースコードをコピーすることでアプリケーションを提供する方法とは別に、アプリケーションのソースコードをユーザーに見えるのを避けるために、[asar](https://github.com/electron/asar) にアーカイブしてアプリケーションをパッケージ化することができます。
 
 `app` フォルダの代わりに `asar` アーカイブを使用するためには、アーカイブファイルを `app.asar` という名前に変更し、Electron のリソースディレクトリに以下のように配置する必要があります。すると、Electron はアーカイブを読み込もうとし、それを開始します。
 
diff --git a/docs-translations/jp/tutorial/application-packaging.md b/docs-translations/jp/tutorial/application-packaging.md
index e5196a6f6262..79b807d3111e 100644
--- a/docs-translations/jp/tutorial/application-packaging.md
+++ b/docs-translations/jp/tutorial/application-packaging.md
@@ -63,8 +63,8 @@ require('/path/to/example.asar/dir/module.js');
 `BrowserWindow` を使って `asar` アーカイブ内の Web ページを表示することもできます:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
-var win = new BrowserWindow({width: 800, height: 600});
+const {BrowserWindow} = require('electron');
+let win = new BrowserWindow({width: 800, height: 600});
 win.loadURL('file:///path/to/example.asar/static/index.html');
 ```
 
@@ -78,7 +78,7 @@ Node API と同様、`asar` アーカイブはディレクトリのように扱
 ```html
 <script>
 var $ = require('./jquery.min.js');
-$.get('file:///path/to/example.asar/file.txt', function(data) {
+$.get('file:///path/to/example.asar/file.txt', (data) => {
   console.log(data);
 });
 </script>
@@ -89,7 +89,7 @@ $.get('file:///path/to/example.asar/file.txt', function(data) {
 アーカイブのチェックサムを検証する等の幾つかのケースでは、`asar` アーカイブをファイルとして読み込む必要があります。この目的のために、 `asar` サポートしないオリジナルの `fs` API を提供するビルトインの `original-fs` モジュールを使用できます。
 
 ```javascript
-var originalFs = require('original-fs');
+const originalFs = require('original-fs');
 originalFs.readFileSync('/path/to/example.asar');
 ```
 
@@ -146,4 +146,4 @@ $ asar pack app app.asar --unpack *.node
 
 このコマンドを実行した後、`app.asar` とは別に、アンパックされたファイルを含んだ`app.asar.unpacked` フォルダーが生成されます。ユーザーに提供するときには、`app.asar` と一緒にコピーしなければなりません。
 
-[asar]: https://github.com/atom/asar
+[asar]: https://github.com/electron/asar
diff --git a/docs-translations/jp/tutorial/devtools-extension.md b/docs-translations/jp/tutorial/devtools-extension.md
index 2c8816a666f8..b631b4e406e9 100644
--- a/docs-translations/jp/tutorial/devtools-extension.md
+++ b/docs-translations/jp/tutorial/devtools-extension.md
@@ -4,7 +4,7 @@
 
 DevToolsエクステンションのために、ソースコードをダウンローし、`BrowserWindow.addDevToolsExtension` APIを使って読み込みます。読み込んだエクステンションは維持されているので、ウィンドウを作成するとき、毎回APIをコールする必要はありません。
 
-** NOTE: React DevTools は動作しません。issue  https://github.com/electron/electron/issues/915 でフォローしています**
+** NOTE: React DevTools は動作しません。issue  https://github.com/electron/electron/issues/915 をご覧ください **
 
 例えば、[React DevTools Extension](https://github.com/facebook/react-devtools)を使うために、最初にソースコードをダウンロードする必要があります。
 
@@ -22,7 +22,7 @@ const BrowserWindow = require('electron').remote.BrowserWindow;
 BrowserWindow.addDevToolsExtension('/some-directory/react-devtools/shells/chrome');
 ```
 
-エクステンションをアンロードするために、名前と`BrowserWindow.removeDevToolsExtension` APIをコールすると、次回DevToolsを開いた時にはロードされません。
+エクステンションをアンロードするために、`BrowserWindow.removeDevToolsExtension` APIを名前を指定してコールすると、次回DevToolsを開いた時にはロードされません。
 
 ```javascript
 BrowserWindow.removeDevToolsExtension('React Developer Tools');
@@ -34,12 +34,12 @@ BrowserWindow.removeDevToolsExtension('React Developer Tools');
 
 ## バックグラウンドページ
 
-今のところ、ElectronはChromエクステンションのバックグラウンドページ機能に対応していません。そのため、Electronでは、この機能に依存するDevToolsエクステンションは動作しません。
+今のところ、ElectronはChromeエクステンションのバックグラウンドページ機能に対応していません。そのため、Electronでは、この機能に依存するDevToolsエクステンションは動作しません。
 
 ## `chrome.*` APIs
 
 いくつかのChromeエクステンションは、`chrome.*` APIsを使用しており、ElectronでそれらのAPIを実装するための努力をしていますが、すべては実装されていません。
 
-すべては実装されていない`chrome.*` APIについて考えると、もしDevToolsエクステンションが `chrome.devtools.*` 以外のAPIを使用していると、エクステンションは動作しない可能性が非常に高いです。
+すべては実装されていない`chrome.*` APIについて考えると、もしDevToolsエクステンションが `chrome.devtools.*` 以外のAPIを使用していると、エクステンションは動作しない可能性が非常に高いです。うまく動作しないエクステンションがあれば、APIのサポートの追加のために、issue trackerへご報告ください。
 
 [devtools-extension]: https://developer.chrome.com/extensions/devtools
diff --git a/docs-translations/jp/tutorial/electron-versioning.md b/docs-translations/jp/tutorial/electron-versioning.md
new file mode 100644
index 000000000000..e8fc8b64c5f8
--- /dev/null
+++ b/docs-translations/jp/tutorial/electron-versioning.md
@@ -0,0 +1,11 @@
+# Electronのバージョン管理
+
+もしあなたが経験豊富なNodeプログラマなら、`semver`(セマンティックバージョニング)のことはご存知でしょうし、バージョン番号をきっちり固定するのではなく、大まかな指針をパッケージの依存管理システムに指定していることと思います。ElectronはNodeとChromiumに強く依存しているので、少し難しい位置付けにあってsemverにきっちり従っていません。そのため、いつでも特定バージョンのElectronを参照しないといけません。
+
+バージョン番号は次のルールに沿ってあげられます。
+
+ * メジャーバージョン: ElectronのAPIに大きな変更があった時- 例えば、`0.37.0`から`1.0.0`にアップグレードした時は、あなたはアプリケーションのアップデートをしなければなりません。
+ * マイナーバージョン: ChromeのメジャーバージョンまたはNodeのマイナーバージョンのアップデート、またはElectronの重大な変更 - 例えば`1.0.0`から`1.1.0`にアップグレードした時は、あなたのアプリは多分動きますが、もしかしたら少々の変更をしないといけないかもしれません。
+ * パッチ: 新しい機能やバグフィックス - `1.0.0`から`1.0.1`へのアップグレードでは、あなたのアプリはそのまま動くはずです。
+ 
+もし、`electron-prebuilt`を使用しているのであれば、Electronのすべてのアップデートが開発者であるあなたによって手動で行われることを保証するために、固定バージョンを指定(`^1.1.0`ではなく`1.1.0`)することをお勧めします。 
diff --git a/docs-translations/jp/tutorial/mac-app-store-submission-guide.md b/docs-translations/jp/tutorial/mac-app-store-submission-guide.md
index 3360d0c47b17..fd42d55937d9 100644
--- a/docs-translations/jp/tutorial/mac-app-store-submission-guide.md
+++ b/docs-translations/jp/tutorial/mac-app-store-submission-guide.md
@@ -42,13 +42,16 @@ Appleから証明書を取得した後、[Application Distribution](application-
   <dict>
     <key>com.apple.security.app-sandbox</key>
     <true/>
-	<key>com.apple.security.temporary-exception.sbpl</key>
-	<string>(allow mach-lookup (global-name-regex #"^org.chromium.Chromium.rohitfork.[0-9]+$"))</string>
+    <key>com.apple.security.application-groups</key>
+    <array>
+      <string>your.bundle.id</string>
+    </array>
   </dict>
 </plist>
 ```
 
-次のスクリプトでアプリを署名します。
+_`your.bundle.id`は`Info.plist`で指定されているあなたのアプリのBundle IDに置き換えてください。_
+そして、次のスクリプトでアプリを署名します。
 
 ```bash
 #!/bin/bash
@@ -87,12 +90,6 @@ OS Xでのアプリのサンドボックス化を行うことが初めてなら
 
 アプリに署名後、iTunes ConnectにアップロードするためにApplication Loaderを使用できます。アップロードする前に[created a record][create-record]を確認してください。
 
-### `temporary-exception`の使用について
-
-アプリのサンドボックス化を行った場合、[App Sandbox Temporary Exception Entitlements][temporary-exception]にしたがって、`temporary-exception｀がエンタイトルメントに追加されます。そのため、なぜこのエントリが必要かを説明する必要があります。
-
-アウリケーションがChromiumブラウザに基づいて作られていることを説明する必要があるでしょうが、それでもこの事のためにAppleの審査から落ちる可能性は残っています。
-
 ### アプリケーションを審査に提出
 
 これらのステップを終えた後、[レビュー用にアプリを登録できます][submit-for-review].
diff --git a/docs-translations/jp/tutorial/using-pepper-flash-plugin.md b/docs-translations/jp/tutorial/using-pepper-flash-plugin.md
index 841a505c1e1a..8f0b56e10500 100644
--- a/docs-translations/jp/tutorial/using-pepper-flash-plugin.md
+++ b/docs-translations/jp/tutorial/using-pepper-flash-plugin.md
@@ -2,7 +2,6 @@
 
 Electronは、Pepper Flashプラグインをサポートしています。ElectronでPepper Flashプラグインを使用するために、マニュアルでPepper Flashプラグインのパスを指定し、アプリケーションで有効化しなければなりません。
 
-Electron now supports the Pepper Flash plugin. To use the Pepper Flash plugin in
 
 ## Flash プラグインのコピー準備
 
@@ -37,10 +36,16 @@ app.on('ready', function() {
 });
 ```
 
-##  `<webview>` タグでFlashプラグインを有効か
+##  `<webview>` タグでFlashプラグインを有効化
 
 `<webview>` タグに`plugins`属性を追加する
 
 ```html
 <webview src="http://www.adobe.com/software/flash/about/" plugins></webview>
 ```
+
+## トラブルシューティング
+
+Pepper Flashプラグインが読み込まれているかは、devtoolsのconsoleで`navigator.plugins`を見ることで確認することができます。(プラグインのパスが正しいかがわからなくても)
+
+Pepper FlashプラグインのアーキテクチャはElectronのアーキテクチャと一致している必要があります。Windowsで、64bit Electronに32bit Flashプラグインを使用するのはよくある間違いです。
diff --git a/docs-translations/jp/tutorial/using-selenium-and-webdriver.md b/docs-translations/jp/tutorial/using-selenium-and-webdriver.md
index 0250436844b2..5e16c75d6439 100644
--- a/docs-translations/jp/tutorial/using-selenium-and-webdriver.md
+++ b/docs-translations/jp/tutorial/using-selenium-and-webdriver.md
@@ -6,7 +6,46 @@
 
 Electronで `chromedriver` を使用するために、Electronがどこにあるかを示し、ElectronはChromeブラウザーであると思わせます。
 
-## WebDriverJsを設定します
+## Spectronの設定
+
+[Spectron][spectron]はElectronのための公式なChromeDriverテストフレームワークです。
+[WebdriverIO](http://webdriver.io/)に基づいてビルドされており、テストの中でElectron APIを使用するヘルパーやChromeDriveを持っています。
+
+```bash
+$ npm install --save-dev spectron
+```
+
+```js
+// 可視のウィンドウがタイトル付きで開かれているかを調べる簡単なテスト
+var Application = require('spectron').Application
+var assert = require('assert')
+
+var app = new Application({
+  path: '/Applications/MyApp.app/Contents/MacOS/MyApp'
+})
+
+app.start().then(function () {
+  // ウィンドウは表示されている？
+  return app.browserWindow.isVisible()
+}).then(function (isVisible) {
+  // ウィンドウが表示されているか確認
+  assert.equal(isVisible, true)
+}).then(function () {
+  // ウィンドウのタイトルを取得
+  return app.client.getTitle()
+}).then(function (title) {
+  // ウィンドウのタイトルを確認
+  assert.equal(title, 'My App')
+}).then(function () {
+  // アプリケーションを止める
+  return app.stop()
+}).catch(function (error) {
+  // 失敗した場合ログを残す
+  console.error('Test failed', error.message)
+})
+```
+
+## WebDriverJsを設定
 
 [WebDriverJs](https://code.google.com/p/selenium/wiki/WebDriverJs) は、web driver でテストするためのNodeパッケージを提供します。例のように使用します。
 
@@ -35,7 +74,7 @@ Electronでの `selenium-webdriver` 使用方法は、chrome driverへの接続
 ```javascript
 const webdriver = require('selenium-webdriver');
 
-var driver = new webdriver.Builder()
+const driver = new webdriver.Builder()
   // The "9515" is the port opened by chrome driver.
   .usingServer('http://localhost:9515')
   .withCapabilities({
@@ -85,7 +124,7 @@ $ npm install webdriverio
 
 ```javascript
 const webdriverio = require('webdriverio');
-var options = {
+const options = {
     host: "localhost", // Use localhost as chrome driver server
     port: 9515,        // "9515" is the port opened by chrome driver.
     desiredCapabilities: {
@@ -97,14 +136,14 @@ var options = {
     }
 };
 
-var client = webdriverio.remote(options);
+let client = webdriverio.remote(options);
 
 client
     .init()
     .url('http://google.com')
     .setValue('#q', 'webdriverio')
     .click('#btnG')
-    .getTitle().then(function(title) {
+    .getTitle().then((title) => {
         console.log('Title was: ' + title);
     })
     .end();
@@ -114,6 +153,7 @@ client
 
 Electronはリビルドせずにアプリケーションをテストするために、単純にElectronのリソースディレクトリでアプリのソースを[配置します](https://github.com/electron/electron/blob/master/docs/tutorial/application-distribution.md)。
 
-もしくは、アプリのフォルダーを引数にしてElectronバイナリを実行します。これは、Electronのリソースディレクトリにアプリをコピー＆ペーストする必要性を除きます。
+もしくは、アプリのフォルダーを引数にしてElectronバイナリを実行します。これによって、Electronのリソースディレクトリにアプリをコピー＆ペーストする必要がなくなります。
 
 [chrome-driver]: https://sites.google.com/a/chromium.org/chromedriver/
+[spectron]: http://electron.atom.io/spectron
diff --git a/docs-translations/jp/tutorial/using-widevine-cdm-plugin.md b/docs-translations/jp/tutorial/using-widevine-cdm-plugin.md
index 55f9d039f611..7c3b76771441 100644
--- a/docs-translations/jp/tutorial/using-widevine-cdm-plugin.md
+++ b/docs-translations/jp/tutorial/using-widevine-cdm-plugin.md
@@ -4,9 +4,9 @@ Electronで、Chromeブラウザーに同梱される Widevine CDMプラグイ
 
 ## プラグインを取得する
 
-Electronは、ライセンス的な理由でWidevine CDMプラグインは同梱されません。Widevine CDMプラグインを取得するために、最初に、使用するElectronビルドのChromバージョンとアーキテクチャを合わせた公式のChromeブラウザーをインストールする必要があります。
+Electronは、ライセンス的な理由でWidevine CDMプラグインは同梱されません。Widevine CDMプラグインを取得するために、最初に、使用するElectronビルドのChromeバージョンとアーキテクチャを合わせた公式のChromeブラウザーをインストールする必要があります。
 
-__Note:__ Chromeブラウザの主要バージョンは、Electronが使用するChromeバージョンと同じでなければなりません。そうでなければ、プラグインは、`navigator.plugins`経由でロードされて表示されるにも関わらず動作しません。
+__Note:__ Chromeブラウザのメジャーバージョンは、Electronが使用するChromeバージョンと同じでなければなりません。そうでなければ、プラグインは、`navigator.plugins`経由でロードされて表示されるにも関わらず動作しません。
 
 ### Windows & OS X
 
@@ -39,14 +39,14 @@ app.commandLine.appendSwitch('widevine-cdm-path', '/path/to/widevinecdmadapter.p
 // The version of plugin can be got from `chrome://plugins` page in Chrome.
 app.commandLine.appendSwitch('widevine-cdm-version', '1.4.8.866');
 
-var mainWindow = null;
-app.on('ready', function() {
-  mainWindow = new BrowserWindow({
+let win = null;
+app.on('ready', () => {
+  win = new BrowserWindow({
     webPreferences: {
       // The `plugins` have to be enabled.
       plugins: true
     }
-  })
+  });
 });
 ```
 

From 06e3e65c1b5ed1fb824887f65bee039573824ea9 Mon Sep 17 00:00:00 2001
From: Bruno Queiros <brunoofq@gmail.com>
Date: Wed, 18 May 2016 11:00:08 -0300
Subject: [PATCH 257/510] :art: Improve error message

---
 lib/renderer/init.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index bff4ea746ca3..aa9ab902ad57 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -121,7 +121,7 @@ if (preloadScript) {
   try {
     require(preloadScript)
   } catch (error) {
-    if (error.code === 'MODULE_NOT_FOUND') {
+    if (error.code === 'MODULE_NOT_FOUND' && error.message.indexOf(preloadScript) > -1) {
       console.error('Unable to load preload script ' + preloadScript)
     } else {
       console.error(error)

From d3e0c082555402e2ff61ffab69f0736cc62fd04c Mon Sep 17 00:00:00 2001
From: Sergey <gaserd123@gmail.com>
Date: Wed, 18 May 2016 18:04:52 +0300
Subject: [PATCH 258/510] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ничего критичного, просто букву не ту поставили.
---
 docs-translations/ru-RU/tutorial/quick-start.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-translations/ru-RU/tutorial/quick-start.md b/docs-translations/ru-RU/tutorial/quick-start.md
index b18d17c41d49..07244ec9be19 100644
--- a/docs-translations/ru-RU/tutorial/quick-start.md
+++ b/docs-translations/ru-RU/tutorial/quick-start.md
@@ -107,7 +107,7 @@ function createWindow () {
 
 //Этот метод будет вызван, когда Electron закончит инициализацию
 //и будет готов создавать окна браузера.
-//Некоторые API возможно использовать только послн того, как
+//Некоторые API возможно использовать только после того, как
 //это произойдёт.
 app.on('ready', createWindow)
 

From e995befcd0772ff9cd917e776403e4c151a5d4cb Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Wed, 18 May 2016 11:07:30 -0700
Subject: [PATCH 259/510] Move everything into atom_bindings

---
 atom/common/api/atom_api_process_stats.cc | 67 -----------------------
 atom/common/api/atom_bindings.cc          | 44 +++++++++++++++
 atom/common/node_bindings.cc              |  1 -
 filenames.gypi                            |  2 -
 lib/common/init.js                        |  2 -
 5 files changed, 44 insertions(+), 72 deletions(-)
 delete mode 100644 atom/common/api/atom_api_process_stats.cc

diff --git a/atom/common/api/atom_api_process_stats.cc b/atom/common/api/atom_api_process_stats.cc
deleted file mode 100644
index 05cbd3fed3e9..000000000000
--- a/atom/common/api/atom_api_process_stats.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2015 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/common/api/atom_api_native_image.h"
-
-#include <string>
-#include <vector>
-
-#include "atom/common/node_includes.h"
-#include "base/process/process_metrics.h"
-#include "native_mate/dictionary.h"
-
-namespace {
-
-v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-  std::unique_ptr<base::ProcessMetrics> metrics(
-    base::ProcessMetrics::CreateCurrentProcessMetrics());
-
-  dict.Set("workingSetSize",
-    static_cast<double>(metrics->GetWorkingSetSize() >> 10));
-  dict.Set("peakWorkingSetSize",
-    static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
-
-  size_t private_bytes, shared_bytes;
-  if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
-    dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
-    dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
-  }
-
-  return dict.GetHandle();
-}
-
-v8::Local<v8::Value> GetSystemMemoryInfo(
-    v8::Isolate* isolate,
-    mate::Arguments* args) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-  base::SystemMemoryInfoKB memInfo;
-
-  if (!base::GetSystemMemoryInfo(&memInfo)) {
-    args->ThrowError("Unable to retrieve system memory information");
-    return v8::Undefined(isolate);
-  }
-
-  dict.Set("total", memInfo.total);
-  dict.Set("free", memInfo.free);
-
-  // NB: These return bogus values on OS X
-#if !defined(OS_MACOSX)
-  dict.Set("swapTotal", memInfo.swap_total);
-  dict.Set("swapFree", memInfo.swap_free);
-#endif
-
-  return dict.GetHandle();
-}
-
-void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
-                v8::Local<v8::Context> context, void* priv) {
-  mate::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
-  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
-}
-
-}  // namespace
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_common_process_stats, Initialize)
diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index f518caf5c503..6b75ddd975df 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -33,6 +33,48 @@ void Hang() {
     base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
 }
 
+v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+  std::unique_ptr<base::ProcessMetrics> metrics(
+    base::ProcessMetrics::CreateCurrentProcessMetrics());
+
+  dict.Set("workingSetSize",
+    static_cast<double>(metrics->GetWorkingSetSize() >> 10));
+  dict.Set("peakWorkingSetSize",
+    static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
+
+  size_t private_bytes, shared_bytes;
+  if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
+    dict.Set("privateBytes", static_cast<double>(private_bytes >> 10));
+    dict.Set("sharedBytes", static_cast<double>(shared_bytes >> 10));
+  }
+
+  return dict.GetHandle();
+}
+
+v8::Local<v8::Value> GetSystemMemoryInfo(
+    v8::Isolate* isolate,
+    mate::Arguments* args) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+  base::SystemMemoryInfoKB memInfo;
+
+  if (!base::GetSystemMemoryInfo(&memInfo)) {
+    args->ThrowError("Unable to retrieve system memory information");
+    return v8::Undefined(isolate);
+  }
+
+  dict.Set("total", memInfo.total);
+  dict.Set("free", memInfo.free);
+
+  // NB: These return bogus values on OS X
+#if !defined(OS_MACOSX)
+  dict.Set("swapTotal", memInfo.swap_total);
+  dict.Set("swapFree", memInfo.swap_free);
+#endif
+
+  return dict.GetHandle();
+}
+
 // Called when there is a fatal error in V8, we just crash the process here so
 // we can get the stack trace.
 void FatalErrorCallback(const char* location, const char* message) {
@@ -63,6 +105,8 @@ void AtomBindings::BindTo(v8::Isolate* isolate,
   dict.SetMethod("crash", &Crash);
   dict.SetMethod("hang", &Hang);
   dict.SetMethod("log", &Log);
+  dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
+  dict.SetMethod("getSystemMemoryInfo", &GetSystemMemoryInfo);
 #if defined(OS_POSIX)
   dict.SetMethod("setFdLimit", &base::SetFdLimit);
 #endif
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index d2d5ebd48890..b3c36fdd8e03 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -54,7 +54,6 @@ REFERENCE_MODULE(atom_common_clipboard);
 REFERENCE_MODULE(atom_common_crash_reporter);
 REFERENCE_MODULE(atom_common_native_image);
 REFERENCE_MODULE(atom_common_screen);
-REFERENCE_MODULE(atom_common_process_stats);
 REFERENCE_MODULE(atom_common_shell);
 REFERENCE_MODULE(atom_common_v8_util);
 REFERENCE_MODULE(atom_renderer_ipc);
diff --git a/filenames.gypi b/filenames.gypi
index 162396bccf3d..f9bbe8f75f1b 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -44,7 +44,6 @@
       'lib/common/api/deprecations.js',
       'lib/common/api/exports/electron.js',
       'lib/common/api/native-image.js',
-      'lib/common/api/process-stats.js',
       'lib/common/api/shell.js',
       'lib/common/init.js',
       'lib/common/reset-search-paths.js',
@@ -293,7 +292,6 @@
       'atom/common/api/atom_api_native_image.cc',
       'atom/common/api/atom_api_native_image.h',
       'atom/common/api/atom_api_native_image_mac.mm',
-      'atom/common/api/atom_api_process_stats.cc',
       'atom/common/api/atom_api_shell.cc',
       'atom/common/api/atom_api_v8_util.cc',
       'atom/common/api/atom_bindings.cc',
diff --git a/lib/common/init.js b/lib/common/init.js
index 8df576831b5f..257249f0a639 100644
--- a/lib/common/init.js
+++ b/lib/common/init.js
@@ -46,5 +46,3 @@ if (process.type === 'browser') {
 if (process.platform === 'win32' && __dirname.indexOf('\\Program Files\\WindowsApps\\') === 2) {
   process.windowsStore = true
 }
-
-Object.assign(Object.getPrototypeOf(process), process.atomBinding('process_stats'))

From 872c6ea763098ce2ff8cc741aceea9a625126cff Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Wed, 18 May 2016 11:08:04 -0700
Subject: [PATCH 260/510] :memo:

---
 docs/api/process.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/api/process.md b/docs/api/process.md
index 1ad8dca175dd..a7740327d68d 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -17,11 +17,7 @@ upstream node:
 * `process.defaultApp` Boolean - When app is started by being passed as
   parameter to the default app, this value is `true` in the main process,
   otherwise it is `undefined`.
-* `process.getSystemMemoryInfo` - Returns the amount of system memory and free
-  swap space
-* `process.getProcessMemoryInfo` - Returns the amount of actual memory used by
-  Chromium for the current process.
-
+  
 ## Events
 
 ### Event: 'loaded'

From 5f9976c46af848cbe2bdc53c77229791bcc920ea Mon Sep 17 00:00:00 2001
From: Sergey <gaserd123@gmail.com>
Date: Wed, 18 May 2016 22:40:12 +0300
Subject: [PATCH 261/510] Create supported-platforms.md

Create new file - supported-platforms.
Russian language for this page - http://electron.atom.io/docs/tutorial/supported-platforms/
---
 .../ru-RU/tutorial/supported-platforms.md         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs-translations/ru-RU/tutorial/supported-platforms.md

diff --git a/docs-translations/ru-RU/tutorial/supported-platforms.md b/docs-translations/ru-RU/tutorial/supported-platforms.md
new file mode 100644
index 000000000000..d927bc0a7b98
--- /dev/null
+++ b/docs-translations/ru-RU/tutorial/supported-platforms.md
@@ -0,0 +1,15 @@
+Платформы поддерживаемые Electron:
+
+#OS X
+Поддерживает только 64-ых битные OS X. Минимально поддерживаемой версией является OS X 10.9
+
+#Windows
+Поддерживаются операционные систем Windows 7 и выше, старые операционные системы не поддерживаются (и не работают).
+Поддерживаются платформы на x86 и amd64 (64-разрядная) для Windows. Будьте внимательны, что ARM Windows не поддерживается на данный момент.
+
+#Linux
+Поддерживает архитектуры ia32(i686 в) и x64(amd64).
+Гарантированно будет работать в дистрибутивах:
+- Ubuntu 12.04 и выше
+- Fedora 21
+- Debian 8

From 161bd89a24ca8ce30b91cdaf041965beda3dff9f Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 18 May 2016 12:54:53 -0700
Subject: [PATCH 262/510] Make js2asar.py more robust

---
 tools/js2asar.py | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/tools/js2asar.py b/tools/js2asar.py
index 7860176c93c7..adad1751e33d 100755
--- a/tools/js2asar.py
+++ b/tools/js2asar.py
@@ -29,22 +29,10 @@ def copy_files(source_files, output_dir):
 
 
 def call_asar(archive, output_dir):
-  asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar')
-  subprocess.check_call([find_node(), asar, 'pack', output_dir, archive])
-
-
-def find_node():
-  WINDOWS_NODE_PATHs = [
-    'C:/Program Files (x86)/nodejs',
-    'C:/Program Files/nodejs',
-  ] + os.environ['PATH'].split(os.pathsep)
-
+  asar = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'asar')
   if sys.platform in ['win32', 'cygwin']:
-    for path in WINDOWS_NODE_PATHs:
-      full_path = os.path.join(path, 'node.exe')
-      if os.path.exists(full_path):
-        return full_path
-  return 'node'
+    asar += '.cmd'
+  subprocess.check_call([asar, 'pack', output_dir, archive])
 
 
 def safe_mkdir(path):

From 046cb0df8d60d1b24b7af08fa96e082876a76f90 Mon Sep 17 00:00:00 2001
From: Bruno Queiros <brunoofq@gmail.com>
Date: Wed, 18 May 2016 19:02:42 -0300
Subject: [PATCH 263/510] :art: Use the same stack trace for both cases

---
 lib/renderer/init.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index aa9ab902ad57..ed0e0e800e62 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -121,11 +121,7 @@ if (preloadScript) {
   try {
     require(preloadScript)
   } catch (error) {
-    if (error.code === 'MODULE_NOT_FOUND' && error.message.indexOf(preloadScript) > -1) {
-      console.error('Unable to load preload script ' + preloadScript)
-    } else {
-      console.error(error)
-      console.error(error.stack)
-    }
+    console.error('Unable to load preload script: ' + preloadScript)
+    console.error(error.stack || error.message)
   }
 }

From 18b2094198099569b0113fb555ea4a0df9f26358 Mon Sep 17 00:00:00 2001
From: Nicola Squartini <tensor5@gmail.com>
Date: Thu, 19 May 2016 10:14:57 +0900
Subject: [PATCH 264/510] Update Clang only if needed

---
 script/bootstrap.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/bootstrap.py b/script/bootstrap.py
index 9087c99dbcdd..4370c7534da2 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -50,8 +50,9 @@ def main():
     libcc_static_library_path = os.path.join(dist_dir, 'static_library')
 
   if PLATFORM != 'win32':
-    # Download prebuilt clang binaries.
-    update_clang()
+    if not args.disable_clang and args.clang_dir == '':
+      # Download prebuilt clang binaries.
+      update_clang()
 
   setup_python_libs()
   update_node_modules('.')

From a361d50b959f8889ebdd356e7bd22560b1dfb0ec Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 10:57:57 +0900
Subject: [PATCH 265/510] Add team ID to base Bundle ID

---
 atom/app/atom_main_delegate_mac.mm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/atom/app/atom_main_delegate_mac.mm b/atom/app/atom_main_delegate_mac.mm
index b26d5f46f644..ea5ab320a4d0 100644
--- a/atom/app/atom_main_delegate_mac.mm
+++ b/atom/app/atom_main_delegate_mac.mm
@@ -10,6 +10,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
+#include "base/strings/sys_string_conversions.h"
 #include "brightray/common/application_info.h"
 #include "brightray/common/mac/main_application_bundle.h"
 #include "content/public/common/content_paths.h"
@@ -52,8 +53,13 @@ void AtomMainDelegate::OverrideChildProcessPath() {
 
 void AtomMainDelegate::SetUpBundleOverrides() {
   base::mac::ScopedNSAutoreleasePool pool;
-  NSBundle* base_bundle = brightray::MainApplicationBundle();
-  base::mac::SetBaseBundleID([[base_bundle bundleIdentifier] UTF8String]);
+  NSBundle* bundle = brightray::MainApplicationBundle();
+  std::string base_bundle_id =
+      base::SysNSStringToUTF8([bundle bundleIdentifier]);
+  NSString* team_id = [bundle objectForInfoDictionaryKey:@"ElectronTeamID"];
+  if (team_id)
+    base_bundle_id = base::SysNSStringToUTF8(team_id) + "." + base_bundle_id;
+  base::mac::SetBaseBundleID(base_bundle_id.c_str());
 }
 
 }  // namespace atom

From 5d906c0e4ed60512396c865f50dda89505d9ad88 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 11:13:09 +0900
Subject: [PATCH 266/510] docs: Team ID is now required for signing

---
 .../mac-app-store-submission-guide.md         | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/docs/tutorial/mac-app-store-submission-guide.md b/docs/tutorial/mac-app-store-submission-guide.md
index 75ebb0776581..28c5ab64f120 100644
--- a/docs/tutorial/mac-app-store-submission-guide.md
+++ b/docs/tutorial/mac-app-store-submission-guide.md
@@ -19,14 +19,33 @@ how to meet the Mac App Store requirements.
 To submit your app to the Mac App Store, you first must get a certificate from
 Apple. You can follow these [existing guides][nwjs-guide] on web.
 
+### Get Team ID
+
+Before signing your app, you need to know the Team ID of your account. To locate
+your Team ID, Sign in to https://developer.apple.com/account/, and click
+Membership in the sidebar. Your Team ID appears in the Membership Information
+section under the team name.
+
 ### Sign Your App
 
-After getting the certificate from Apple, you can package your app by following
+After finishing the preparation work, you can package your app by following
 [Application Distribution](application-distribution.md), and then proceed to
-signing your app. This step is basically the same with other programs, but the
-key is to sign every dependency of Electron one by one.
+signing your app.
 
-First, you need to prepare two entitlements files.
+First, you have to add a `ElectronTeamID` key to your app's `Info.plist`, which
+has your Team ID as key:
+
+```xml
+<plist version="1.0">
+<dict>
+  ...
+  <key>ElectronTeamID</key>
+  <string>TEAM_ID</string>
+</dict>
+</plist>
+```
+
+Then, you need to prepare two entitlements files.
 
 `child.plist`:
 
@@ -53,15 +72,13 @@ First, you need to prepare two entitlements files.
     <key>com.apple.security.app-sandbox</key>
     <true/>
     <key>com.apple.security.application-groups</key>
-    <array>
-      <string>your.bundle.id</string>
-    </array>
+    <string>TEAM_ID.your.bundle.id</string>
   </dict>
 </plist>
 ```
 
-_You have to replace `your.bundle.id` with the Bundle ID specified in your app's
-`Info.plist`._
+You have to replace `TEAM_ID` with your Team ID, and replace `your.bundle.id`
+with the Bundle ID of your app.
 
 And then sign your app with the following script:
 

From d8c05ecc0d5a0efc42e8b08244a6d744095baae8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 15:06:47 +0900
Subject: [PATCH 267/510] Link with Vs2015 runtime statically for Release build

---
 script/lib/config.py | 2 +-
 vendor/brightray     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index 7b70a7308820..e879d7a21c42 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = 'e5ddff3e0d277703e2c1adc363d49709cf1bc56a'
+LIBCHROMIUMCONTENT_COMMIT = '7509afe48dbb438e921e5fccf08603340b41c308'
 
 PLATFORM = {
   'cygwin': 'win32',
diff --git a/vendor/brightray b/vendor/brightray
index d5ddb834fe5b..bf56e3a38f50 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit d5ddb834fe5bc7d914e098ecf7c35b10b5322f54
+Subproject commit bf56e3a38f50a2b12d28f8b3bf8adb7dc628f671

From 359123458d284f92daff000610519eb9e99d1b1b Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Wed, 18 May 2016 23:39:16 -0700
Subject: [PATCH 268/510] =?UTF-8?q?=F0=9F=8D=8E=20=20allow=20x-axis=20offs?=
 =?UTF-8?q?et=20to=20be=20set=20for=20sheets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 atom/browser/api/atom_api_window.cc |  9 +++++++--
 atom/browser/api/atom_api_window.h  |  3 ++-
 atom/browser/native_window.cc       | 20 +++++++++++++++-----
 atom/browser/native_window.h        | 12 ++++++++----
 atom/browser/native_window_mac.mm   |  4 +++-
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 399b4d36d2ec..0266d49a85d5 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -371,8 +371,12 @@ std::vector<int> Window::GetMaximumSize() {
   return result;
 }
 
-void Window::SetSheetOffset(double offset) {
-  window_->SetSheetOffset(offset);
+void Window::SetSheetOffset(double offsetY) {
+  window_->SetSheetOffset(offsetY);
+}
+
+void Window::SetSheetOffsets(double offsetX, double offsetY) {
+  window_->SetSheetOffsets(offsetX, offsetY);
 }
 
 void Window::SetResizable(bool resizable) {
@@ -682,6 +686,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setMaximumSize", &Window::SetMaximumSize)
       .SetMethod("getMaximumSize", &Window::GetMaximumSize)
       .SetMethod("setSheetOffset", &Window::SetSheetOffset)
+      .SetMethod("setSheetOffsets", &Window::SetSheetOffsets)
       .SetMethod("setResizable", &Window::SetResizable)
       .SetMethod("isResizable", &Window::IsResizable)
       .SetMethod("setMovable", &Window::SetMovable)
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index a00e063d99f8..2eef725eaca8 100644
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -110,7 +110,8 @@ class Window : public mate::TrackableObject<Window>,
   std::vector<int> GetMinimumSize();
   void SetMaximumSize(int width, int height);
   std::vector<int> GetMaximumSize();
-  void SetSheetOffset(double offset);
+  void SetSheetOffset(double offsetY);
+  void SetSheetOffsets(double offsetX, double offsetY);
   void SetResizable(bool resizable);
   bool IsResizable();
   void SetMovable(bool movable);
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 0d5c26c560d1..af874cae483d 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -53,7 +53,8 @@ NativeWindow::NativeWindow(
       enable_larger_than_screen_(false),
       is_closed_(false),
       has_dialog_attached_(false),
-      sheet_offset_(0.0),
+      sheet_offset_x_(0.0),
+      sheet_offset_y_(0.0),
       aspect_ratio_(0.0),
       inspectable_web_contents_(inspectable_web_contents),
       weak_factory_(this) {
@@ -254,12 +255,21 @@ gfx::Size NativeWindow::GetMaximumSize() {
   return GetSizeConstraints().GetMaximumSize();
 }
 
-void NativeWindow::SetSheetOffset(const double offset) {
-  sheet_offset_ = offset;
+void NativeWindow::SetSheetOffset(const double offsetY) {
+  sheet_offset_y_ = offsetY;
 }
 
-double NativeWindow::GetSheetOffset() {
-  return sheet_offset_;
+void NativeWindow::SetSheetOffsets(const double offsetX, const double offsetY) {
+  sheet_offset_x_ = offsetX;
+  sheet_offset_y_ = offsetY;
+}
+
+double NativeWindow::GetSheetOffsetX() {
+  return sheet_offset_x_;
+}
+
+double NativeWindow::GetSheetOffsetY() {
+  return sheet_offset_y_;
 }
 
 void NativeWindow::SetRepresentedFilename(const std::string& filename) {
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 7317a7ba6f76..813eeb53126d 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -123,8 +123,10 @@ class NativeWindow : public base::SupportsUserData,
   virtual gfx::Size GetMinimumSize();
   virtual void SetMaximumSize(const gfx::Size& size);
   virtual gfx::Size GetMaximumSize();
-  virtual void SetSheetOffset(const double offset);
-  virtual double GetSheetOffset();
+  virtual void SetSheetOffset(const double offsetY);
+  virtual void SetSheetOffsets(const double offsetX, const double offsetY);
+  virtual double GetSheetOffsetX();
+  virtual double GetSheetOffsetY();
   virtual void SetResizable(bool resizable) = 0;
   virtual bool IsResizable() = 0;
   virtual void SetMovable(bool movable) = 0;
@@ -320,8 +322,10 @@ class NativeWindow : public base::SupportsUserData,
   // it should be cancelled when we can prove that the window is responsive.
   base::CancelableClosure window_unresposive_closure_;
 
-  // Used to display sheets at the appropriate vertical offset
-  double sheet_offset_;
+  // Used to display sheets at the appropriate horizontal and vertical offsets
+  // on OS X.
+  double sheet_offset_x_;
+  double sheet_offset_y_;
 
   // Used to maintain the aspect ratio of a view which is inside of the
   // content view.
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index bfffc7a08d64..333b282266f5 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -257,7 +257,9 @@ bool ScopedDisableResize::disable_resize_ = false;
 - (NSRect)window:(NSWindow*)window
     willPositionSheet:(NSWindow*)sheet usingRect:(NSRect)rect {
   NSView* view = window.contentView;
-  rect.origin.y = view.frame.size.height - shell_->GetSheetOffset();
+
+  rect.origin.x = shell_->GetSheetOffsetX();
+  rect.origin.y = view.frame.size.height - shell_->GetSheetOffsetY();
   return rect;
 }
 

From 4702d8b640a3ed061f1785b5b579cc8b15c97ee9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 15:49:26 +0900
Subject: [PATCH 269/510] No need to download and ship vs runtime libraries

---
 electron.gyp                       | 3 ---
 script/create-dist.py              | 3 ---
 script/update-external-binaries.py | 1 -
 3 files changed, 7 deletions(-)

diff --git a/electron.gyp b/electron.gyp
index f4172866c047..2abf7ce58147 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -157,9 +157,6 @@
                 '<(libchromiumcontent_dir)/snapshot_blob.bin',
                 'external_binaries/d3dcompiler_47.dll',
                 'external_binaries/xinput1_3.dll',
-                'external_binaries/msvcp140.dll',
-                'external_binaries/vccorlib140.dll',
-                'external_binaries/vcruntime140.dll',
               ],
             },
           ],
diff --git a/script/create-dist.py b/script/create-dist.py
index 56a42e794e44..4601f6df564d 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -36,7 +36,6 @@ TARGET_BINARIES = {
     'icudtl.dat',
     'libEGL.dll',
     'libGLESv2.dll',
-    'msvcp140.dll',
     'ffmpeg.dll',
     'node.dll',
     'content_resources_200_percent.pak',
@@ -44,8 +43,6 @@ TARGET_BINARIES = {
     'xinput1_3.dll',
     'natives_blob.bin',
     'snapshot_blob.bin',
-    'vccorlib140.dll',
-    'vcruntime140.dll',
   ],
   'linux': [
     PROJECT_NAME,  # 'electron'
diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py
index 35e6325adfae..c70860707e86 100755
--- a/script/update-external-binaries.py
+++ b/script/update-external-binaries.py
@@ -30,7 +30,6 @@ def main():
     download_and_unzip('Squirrel')
   elif sys.platform in ['cygwin', 'win32']:
     download_and_unzip('directxsdk-' + get_target_arch())
-    download_and_unzip('vs2015-crt-' + get_target_arch())
 
   with open(version_file, 'w') as f:
     f.write(VERSION)

From eaacbc86c7f2a5997e75615a6acdfefd1cf198eb Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Wed, 18 May 2016 23:59:18 -0700
Subject: [PATCH 270/510] =?UTF-8?q?=F0=9F=93=9D=20=20update=20english=20do?=
 =?UTF-8?q?cs=20to=20include=20setSheetOffsets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/api/browser-window.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 93785878d146..a00b814a598c 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -682,7 +682,7 @@ Returns the title of the native window.
 **Note:** The title of web page can be different from the title of the native
 window.
 
-### `win.setSheetOffset(offset)` _OS X_
+### `win.setSheetOffset(offsetY)` _OS X_
 
 Changes the attachment point for sheets on Mac OS X. By default, sheets are
 attached just below the window frame, but you may want to display them beneath
@@ -693,6 +693,16 @@ let toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
 win.setSheetOffset(toolbarRect.height);
 ```
 
+### `win.setSheetOffsets(offsetX, offsetY)` _OS X_
+
+Like `win.setSheetOffset` but allows for an offset along the x-axis to be set
+in addition to the y-axis.
+
+```javascript
+let toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
+win.setSheetOffset(toolbarRect.left, toolbarRect.height);
+```
+
 ### `win.flashFrame(flag)`
 
 * `flag` Boolean

From e609a5bee290eb32d99278e9863ea48d77792a46 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 16:38:37 +0900
Subject: [PATCH 271/510] Fix passing fd across modules

---
 atom/common/asar/archive.cc | 12 ++++++------
 atom/node/osfhandle.cc      | 19 +++++++++++++++++++
 atom/node/osfhandle.h       | 28 ++++++++++++++++++++++++++++
 common.gypi                 |  5 +++++
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 atom/node/osfhandle.cc
 create mode 100644 atom/node/osfhandle.h

diff --git a/atom/common/asar/archive.cc b/atom/common/asar/archive.cc
index 01fe23a88922..4f04812e07e7 100644
--- a/atom/common/asar/archive.cc
+++ b/atom/common/asar/archive.cc
@@ -4,10 +4,6 @@
 
 #include "atom/common/asar/archive.h"
 
-#if defined(OS_WIN)
-#include <io.h>
-#endif
-
 #include <string>
 #include <vector>
 
@@ -20,6 +16,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 
+#if defined(OS_WIN)
+#include "atom/node/osfhandle.h"
+#endif
+
 namespace asar {
 
 namespace {
@@ -118,7 +118,7 @@ Archive::Archive(const base::FilePath& path)
     : path_(path),
       file_(path_, base::File::FLAG_OPEN | base::File::FLAG_READ),
 #if defined(OS_WIN)
-      fd_(_open_osfhandle(
+      fd_(node::open_osfhandle(
               reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0)),
 #elif defined(OS_POSIX)
       fd_(file_.GetPlatformFile()),
@@ -131,7 +131,7 @@ Archive::Archive(const base::FilePath& path)
 Archive::~Archive() {
 #if defined(OS_WIN)
   if (fd_ != -1) {
-    _close(fd_);
+    node::close(fd_);
     // Don't close the handle since we already closed the fd.
     file_.TakePlatformFile();
   }
diff --git a/atom/node/osfhandle.cc b/atom/node/osfhandle.cc
new file mode 100644
index 000000000000..33403dc52371
--- /dev/null
+++ b/atom/node/osfhandle.cc
@@ -0,0 +1,19 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "osfhandle.h"
+
+#include <io.h>
+
+namespace node {
+
+int open_osfhandle(intptr_t osfhandle, int flags) {
+  return _open_osfhandle(osfhandle, flags);
+}
+
+int close(int fd) {
+  return _close(fd);
+}
+
+}  // namespace node
diff --git a/atom/node/osfhandle.h b/atom/node/osfhandle.h
new file mode 100644
index 000000000000..6ebb2ab11e9d
--- /dev/null
+++ b/atom/node/osfhandle.h
@@ -0,0 +1,28 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_NODE_OSFHANDLE_H_
+#define ATOM_NODE_OSFHANDLE_H_
+
+#include <windows.h>
+
+#include "node_extern.h"
+
+namespace node {
+
+// The _open_osfhandle and _close functions on Windows are provided by the
+// Visual C++ library, so the fd returned by them can only be used in the
+// same instance of VC++ library.
+// However Electron is linking with VC++ library statically, so electron.exe
+// shares a different instance of VC++ library with node.exe. This results
+// in fd created in electron.exe not usable in node.dll, so we have to ensure
+// we always create fd in one instance of VC++ library.
+// Followings wrappers are compiled in node.dll, and all code in electron.exe
+// should call these wrappers instead of calling _open_osfhandle directly.
+NODE_EXTERN int open_osfhandle(intptr_t osfhandle, int flags);
+NODE_EXTERN int close(int fd);
+
+}  // namespace node
+
+#endif  // ATOM_NODE_OSFHANDLE_H_
diff --git a/common.gypi b/common.gypi
index 58b33a37bd3c..1a79ec1aef34 100644
--- a/common.gypi
+++ b/common.gypi
@@ -118,7 +118,12 @@
         ],
       }],
       ['_target_name=="node"', {
+        'sources': [
+          '<(DEPTH)/atom/node/osfhandle.cc',
+          '<(DEPTH)/atom/node/osfhandle.h',
+        ],
         'include_dirs': [
+          '<(DEPTH)/atom/node',
           '<(libchromiumcontent_src_dir)/v8',
           '<(libchromiumcontent_src_dir)/v8/include',
         ],

From f8c1db160ebc6b42baec294ba4ffed03805c95c4 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 17:02:40 +0900
Subject: [PATCH 272/510] Only use the osfhandle hack on Windows

---
 common.gypi | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/common.gypi b/common.gypi
index 1a79ec1aef34..6d5558257848 100644
--- a/common.gypi
+++ b/common.gypi
@@ -118,12 +118,7 @@
         ],
       }],
       ['_target_name=="node"', {
-        'sources': [
-          '<(DEPTH)/atom/node/osfhandle.cc',
-          '<(DEPTH)/atom/node/osfhandle.h',
-        ],
         'include_dirs': [
-          '<(DEPTH)/atom/node',
           '<(libchromiumcontent_src_dir)/v8',
           '<(libchromiumcontent_src_dir)/v8/include',
         ],
@@ -135,7 +130,17 @@
             },
           }],
           ['OS=="win"', {
+            # Fix passing fd across modules, see |osfhandle.h| for more.
+            'sources': [
+              '<(DEPTH)/atom/node/osfhandle.cc',
+              '<(DEPTH)/atom/node/osfhandle.h',
+            ],
+            'include_dirs': [
+              '<(DEPTH)/atom/node',
+            ],
+            # Node is using networking API but linking with this itself.
             'libraries': [ '-lwinmm.lib' ],
+            # Fix the linking error with icu.
             'conditions': [
               ['libchromiumcontent_component==0', {
                 'variables': {

From 2b7c3735bd31726804c8b996a4c4d55dbab26a4b Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Thu, 19 May 2016 17:22:51 +0900
Subject: [PATCH 273/510] :memo: Update Korean docs as upstream

[ci skip]
---
 docs-translations/ko-KR/api/auto-updater.md   |   2 +-
 .../ko-KR/api/system-preferences.md           |   9 +-
 docs-translations/ko-KR/api/web-contents.md   |   4 +
 .../development/debug-instructions-windows.md |   2 +-
 .../mac-app-store-submission-guide.md         |  52 ++++---
 .../ko-KR/tutorial/windows-store-guide.md     | 136 ++++++++++++++++++
 6 files changed, 177 insertions(+), 28 deletions(-)
 create mode 100644 docs-translations/ko-KR/tutorial/windows-store-guide.md

diff --git a/docs-translations/ko-KR/api/auto-updater.md b/docs-translations/ko-KR/api/auto-updater.md
index 86ec45390d34..d7dc9c18a46a 100644
--- a/docs-translations/ko-KR/api/auto-updater.md
+++ b/docs-translations/ko-KR/api/auto-updater.md
@@ -26,7 +26,7 @@ OS X에선 `auto-updater` 모듈이 [Squirrel.Mac][squirrel-mac]를 기반으로
 서버 사이드 요구 사항은 [서버 지원][server-support]을 참고하세요.
 
 **참고:** Mac OS X에서 자동 업데이트를 지원하려면 반드시 사인이 되어있어야 합니다.
-이것은 `Squirrel.Mac`의 요구사항입니다.
+이것은 `Squirrel.Mac`의 요구 사항입니다.
 
 ### Windows
 
diff --git a/docs-translations/ko-KR/api/system-preferences.md b/docs-translations/ko-KR/api/system-preferences.md
index c5707ea7eaf1..8a98dd1d5432 100644
--- a/docs-translations/ko-KR/api/system-preferences.md
+++ b/docs-translations/ko-KR/api/system-preferences.md
@@ -14,11 +14,14 @@
 * `event` String
 * `callback` Function
 
-OS X의 네이티브 알림을 구독하며, 해당하는 `event`가 발생하면 `callback`이 호출됩니다.
+OS X의 네이티브 알림을 구독하며, 해당하는 `event`가 발생하면 `callback`이
+`callback(event, userInfo)` 형태로 호출됩니다. `userInfo`는 알림과 함께 전송되는
+사용자 정보 딕셔너리를 포함하는 객체입니다.
+
 구독자의 `id`가 반환되며 `event`를 구독 해제할 때 사용할 수 있습니다.
 
-이 API는 후드에서 `NSDistributedNotificationCenter`를 구독하며, `event`에서 사용
-가능한 값은 다음과 같습니다:
+이 API는 후드에서 `NSDistributedNotificationCenter`를 구독하며, `event`의 예시
+값은 다음과 같습니다:
 
 * `AppleInterfaceThemeChangedNotification`
 * `AppleAquaColorVariantChanged`
diff --git a/docs-translations/ko-KR/api/web-contents.md b/docs-translations/ko-KR/api/web-contents.md
index d75c7911b668..0510f0bd5788 100644
--- a/docs-translations/ko-KR/api/web-contents.md
+++ b/docs-translations/ko-KR/api/web-contents.md
@@ -895,6 +895,10 @@ win.webContents.on('did-finish-load', () => {
 
 `WebContents`객체들은 다음 속성들을 가지고 있습니다:
 
+### `webContents.id`
+
+이 WebContents의 유일 ID.
+
 ### `webContents.session`
 
 이 webContents에서 사용하는 [session](session.md) 객체를 반환합니다.
diff --git a/docs-translations/ko-KR/development/debug-instructions-windows.md b/docs-translations/ko-KR/development/debug-instructions-windows.md
index 35c49bc7e709..27f96c284b00 100644
--- a/docs-translations/ko-KR/development/debug-instructions-windows.md
+++ b/docs-translations/ko-KR/development/debug-instructions-windows.md
@@ -8,7 +8,7 @@ Electron 소스 코드가 중단점을 통해 순차적으로 쉽게 디버깅
 ## 요구 사항
 
 * **Electron의 디버그 빌드**: 가장 쉬운 방법은 보통
-  [Windows용 빌드 설명서](build-instructions-windows.md)에 명시된 요구사항과 툴을
+  [Windows용 빌드 설명서](build-instructions-windows.md)에 명시된 요구 사항과 툴을
   사용하여 스스로 빌드하는 것입니다. 물론 직접 다운로드 받은 Electron 바이너리에도
   디버거 연결 및 디버깅을 사용할 수 있지만, 실질적으로 디버깅이 까다롭게 고도의
   최적화가 되어있음을 발견하게 될 것입니다: 인라인화, 꼬리 호출, 이외 여러 가지
diff --git a/docs-translations/ko-KR/tutorial/mac-app-store-submission-guide.md b/docs-translations/ko-KR/tutorial/mac-app-store-submission-guide.md
index 8fd25a303af0..c4dd2ca0423a 100644
--- a/docs-translations/ko-KR/tutorial/mac-app-store-submission-guide.md
+++ b/docs-translations/ko-KR/tutorial/mac-app-store-submission-guide.md
@@ -20,13 +20,32 @@ Electron은 v0.34.0 버전부터 앱 패키지를 Mac App Store(MAS)에 제출
 앱 스토어에 어플리케이션을 제출하려면, 먼저 Apple로부터 인증서를 취득해야 합니다. 취득
 방법은 웹에서 찾아볼 수 있는 [가이드][nwjs-guide]를 참고하면 됩니다.
 
+### Team ID 얻기
+
+어플리케이션에 서명하기 전에, 먼저 개발 계정의 Team ID를 알아야 합니다. Team ID를
+알아보려면 [Apple Developer Center](https://developer.apple.com/account/)에
+로그인한 후, 사이드바의 Membership을 클릭합니다. Team ID는 Membership Information
+섹션의 팀 이름 밑에 위치합니다.
+
 ### 앱에 서명하기
 
-Apple로부터 인증서를 취득했다면, [어플리케이션 배포](application-distribution.md)
-문서에 따라 어플리케이션을 패키징한 후 어플리케이션에 서명 합니다. 이 절차는 기본적으로
-다른 프로그램과 같습니다. 하지만 키는 Electron 종속성 파일에 각각 따로 서명 해야 합니다.
+준비 작업이 끝난 후, [어플리케이션 배포](application-distribution.md) 문서에 따라
+어플리케이션을 패키징한 후 어플리케이션에 서명 합니다.
 
-첫번째, 다음 두 자격(plist) 파일을 준비합니다.
+먼저, Team ID를 키로 가지고 있는 어플리케이션의 `Info.plist`에 `ElectronTeamID` 키를
+추가해야 합니다:
+
+```xml
+<plist version="1.0">
+<dict>
+  ...
+  <key>ElectronTeamID</key>
+  <string>TEAM_ID</string>
+</dict>
+</plist>
+```
+
+그리고, 다음 두 자격 파일을 준비해야 합니다.
 
 `child.plist`:
 
@@ -52,13 +71,16 @@ Apple로부터 인증서를 취득했다면, [어플리케이션 배포](applica
   <dict>
     <key>com.apple.security.app-sandbox</key>
     <true/>
-    <key>com.apple.security.temporary-exception.sbpl</key>
-    <string>(allow mach-lookup (global-name-regex #"^org.chromium.Chromium.rohitfork.[0-9]+$"))</string>
+    <key>com.apple.security.application-groups</key>
+    <string>TEAM_ID.your.bundle.id</string>
   </dict>
 </plist>
 ```
 
-그리고 다음 스크립트에 따라 어플리케이션에 서명합니다:
+`TEAM_ID` 부분은 Team ID로 치환하고, `your.bundle.id` 부분은 어플리케이션의 Bundle
+ID로 치환해야 합니다.
+
+그리고 다음 스크립트를 통해 어플리케이션에 서명합니다:
 
 ```bash
 #!/bin/bash
@@ -101,22 +123,6 @@ productbuild --component "$APP_PATH" /Applications --sign "$INSTALLER_KEY" "$RES
 사용할 수 있습니다. 참고로 업로드하기 전에 [레코드][create-record]를 만들었는지
 확인해야 합니다.
 
-### `temporary-exception`의 사용처 설명
-
-어플리케이션을 샌드박싱할 때 `temporary-exception` 엔트리가 자격에 추가되며
-[어플리케이션 샌드박스 임시 예외 적용][temporary-exception] 문서에 따라
-왜 이 엔트리가 필요한지 설명해야 합니다:
-
-> Note: If you request a temporary-exception entitlement, be sure to follow the
-guidance regarding entitlements provided on the iTunes Connect website. In
-particular, identify the entitlement and corresponding issue number in the App
-Sandbox Entitlement Usage Information section in iTunes Connect and explain why
-your app needs the exception.
-
-아마 제출하려는 어플리케이션이 Chromium 브라우저를 기반으로 만들어졌고, 또한
-멀티-프로세스 구조를 위해 Mach 포트를 사용하는 것도 설명해야 할 수 있습니다. 하지만
-여전히 이러한 문제 때문에 어플리케이션 심사에 실패할 수 있습니다.
-
 ### 어플리케이션을 심사에 제출
 
 위 과정을 마치면 [어플리케이션을 심사를 위해 제출][submit-for-review]할 수 있습니다.
diff --git a/docs-translations/ko-KR/tutorial/windows-store-guide.md b/docs-translations/ko-KR/tutorial/windows-store-guide.md
new file mode 100644
index 000000000000..e6401b08563d
--- /dev/null
+++ b/docs-translations/ko-KR/tutorial/windows-store-guide.md
@@ -0,0 +1,136 @@
+# Windows 스토어 가이드
+
+Windows 8부터, 오래되고 좋은 win32 실행 파일이 새로운 형제를 얻었습니다: Universial
+Windows Platform. 새로운 `.appx` 포맷은 Cortana와 푸시 알림과 같은 다수의 강력한
+API뿐만 아니라, Windows Store를 통해 설치와 업데이트를 단순화합니다.
+
+Microsoft는 개발자들이 새로운 어플리케이션 모델의 좋은 기능들을 사용할 수 있도록
+[Electron 어플리케이션을 `.appx` 패키지로 컴파일시키는 도구를 개발했습니다](http://github.com/catalystcode/electron-windows-store).
+이 가이드는 이 도구를 사용하는 방법과 Electron AppX 패키지의 호환성과 한정 사항을
+설명합니다.
+
+## 기본 상식과 요구 사항
+
+Windows 10 "기념일 업데이트"는 win32 `.exe` 바이너리를 가상화된 파일 시스템과
+레지스트리를 함께 실행시킬 수 있도록 만들었습니다. 두 가지 모두 실행 중인
+어플리케이션과 Windows 컨테이너 안의 인스톨러에 의해 컴파일되는 동안 만들어지며,
+설치가 되는 동안 Windows가 확실하게 어떤 변경 사항이 운영 체제에 적용되는지 식별할 수
+있도록 합니다. 가상 파일 시스템과 가상 레지스트리를 페어링 하는 실행 파일은 Windows가
+원-클릭으로 설치와 삭제를 할 수 있도록 만듭니다.
+
+더 나아가서, exe는 appx 모델 안에서 실행됩니다 - 이 말은 즉 Universial Windows
+Platform에서 제공되는 수많은 API를 사용할 수 있다는 이야기입니다. 더 많은 기능을
+사용하기 위해, Electron 어플리케이션은 숨겨진 UWP 앱과 페어링 하여 `exe`와 같이
+실행할 수 있습니다 - 이렇게 헬퍼와 비슷하게 실행되고 작업을 실행하기 위해
+백그라운드에서 작동하며, 푸시 알림을 받거나, 다른 UWP 어플리케이션과 통신하는 역할을
+합니다.
+
+현재 존재하는 Electron 어플리케이션을 컴파일 하려면, 다음 요구 사항을 충족해야 합니다:
+
+* Windows 10 기념일 업데이트 - 엔터프라이즈 에디션 (이 업데이트는 빌드 번호가 14316
+  이거나, 더 높습니다 - 2016년 5월, Windows Insiders Preview 업데이트에 포함되어
+  있습니다)
+* 64 비트 (x64) 머신과 프로세서, 하드웨어-보조 가상화, 그리고 Second Level Address
+  Translation (SLAT)
+* Windows 10 SDK, [여기서](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
+  다운로드할 수 있습니다.
+* 최소 Node 4 버전 이상 (버전을 확인하려면 `node -v`를 실행하세요)
+
+그리고 CLI에서 `electron-windows-store`를 설치합니다:
+
+```
+npm install -g electron-windows-store
+```
+
+## 설정과 준비
+
+처음 CLI를 실행하기 전에, "Windows Desktop App Converter"를 먼저 설정해야 합니다.
+이 작업은 약 몇 분 정도 소요됩니다. 하지만 걱정하지 않아도 됩니다 - 이 작업은 딱 한
+번만 하면 됩니다. Desktop App Converter는 [여기](https://www.microsoft.com/en-us/download/details.aspx?id=51691)에서
+다운로드받을 수 있고, `DesktopAppConverter.zip`와 `BaseImage-14316.wim` 두 파일을
+모두 받아야 합니다.
+
+1. `DesktopAppConverter.zip`의 압축을 풉니다. 그다음 PowerShell을 관리자 권한으로
+  실행하고 압축을 푼 위치로 이동합니다. (실행하는 모든 명령에 "관리자 권한"을
+  적용하려면 `Set-ExecutionPolicy bypass`를 실행하면 됩니다)
+2. 그리고, `.\DesktopAppConverter.ps1 -Setup -BaseImage .\BaseImage-14316.wim`를
+  실행하여 Windows 베이스 이미지 (`BaseImage-14316.wim`)를 Desktop App Converter로
+  전달하고 설치를 진행합니다.
+3. 만약 위 명령이 재시작을 요구하면, 기기를 재시작하고 위 명령을 다시 실행시키세요.
+
+설치가 완료되면, 컴파일할 Electron 어플리케이션 경로로 이동합니다.
+
+## Electron 어플리케이션 패키지 만들기
+
+[electron-packager](https://github.com/electron-userland/electron-packager)를
+사용하여 어플리케이션을 패키징합니다. (또는 비슷한 도구를 사용합니다) 마지막으로 최종
+어플리케이션에선 `node_modules`가 필요 없으며 그저 어플리케이션의 크기를 늘릴 뿐이니
+확실하게 지웠는지 확인합니다.
+
+출력된 파일들은 대충 다음과 같아야 합니다:
+
+```
+├── Ghost.exe
+├── LICENSE
+├── content_resources_200_percent.pak
+├── content_shell.pak
+├── d3dcompiler_47.dll
+├── ffmpeg.dll
+├── icudtl.dat
+├── libEGL.dll
+├── libGLESv2.dll
+├── locales
+│   ├── am.pak
+│   ├── ar.pak
+│   ├── [...]
+├── msvcp120.dll
+├── msvcr120.dll
+├── natives_blob.bin
+├── node.dll
+├── pdf.dll
+├── resources
+│   ├── app
+│   └── atom.asar
+├── snapshot_blob.bin
+├── squirrel.exe
+├── ui_resources_200_percent.pak
+├── vccorlib120.dll
+└── xinput1_3.dll
+```
+
+## 명령줄 도구 실행하기
+
+관리자 권한의 PowerShell ("관리자 권한으로 실행")을 실행하고, 디렉토리 입력과 출력,
+어플리케이션의 이름과 버전, 마지막으로 `node_modules`를 평탄화시키는 인수들과 함께
+`electron-windows-store`를 실행합니다.
+
+```
+electron-windows-store `
+    --input-directory C:\myelectronapp `
+    --output-directory C:\output\myelectronapp `
+    --flatten true `
+    --package-version 1.0.0.0 `
+    --package-name myelectronapp
+```
+
+명령이 실행되면, 도구는 다음과 같이 작동합니다: Electron 어플리케이션을 입력으로 받고,
+`node_modules`를 평탄화하고 어플리케이션을 `app.zip`으로 압축합니다. 그리고
+인스톨러와 Windows Container를 사용하여, "확장된" AppX 패키지를 만듭니다 -
+Windows Application Manifest (`AppXManifest.xml`)와 동시에 가상 파일 시스템과 가상
+레지스트리를 포함하여 출력 폴더로 내보냅니다.
+
+확장된 AppX 파일이 만들어지면, 도구는 Windows App Packager (`MakeAppx.exe`)를
+사용하여 디스크의 파일로부터 단일-파일 AppX 패키지를 생성해냅니다. 최종적으로, 이
+도구는 새 AppX 패키지에 서명하기 위해 컴퓨터에서 신뢰된 인증서를 만드는 데 사용할 수
+있습니다. 서명된 AppX 패키지로, CLI는 자동으로 기기에 패키지를 설치할 수 있습니다.
+
+## AppX 패키지 사용하기
+
+Windows 기념일 업데이트 (코드네임 Windows 레드스톤)가 아직 모든 일반 사용자에게
+배포되지 않았기 때문에, 올해까지는 어플리케이션을 Windows Store에 올릴 수 없을 것
+입니다 - 하지만 개발자 또는 회사 환경에서 `Add-AppxPackage`
+[PowerShell Cmdlet을 통해](https://technet.microsoft.com/en-us/library/hh856048.aspx)
+기기에 어플리케이션을 설치할 수 있습니다.
+
+또 다른 중요한 제약은 컴파일된 AppX 패키지는 여전히 win32 실행 파일이 담겨있다는
+것입니다 - 따라서 Xbox, HoloLen, Phone에서 실행할 수 없습니다.

From 5c8ecd8a972cad287bbe1fdc0e576dafd0d3eb97 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Thu, 19 May 2016 18:24:42 +0900
Subject: [PATCH 274/510] :memo: Small fixes

* Adjust line length to `80`.
* Fix typos

[ci skip]
---
 docs/tutorial/windows-store-guide.md | 90 +++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 20 deletions(-)

diff --git a/docs/tutorial/windows-store-guide.md b/docs/tutorial/windows-store-guide.md
index c3ab6e22ed42..ccd3c1cff3a1 100644
--- a/docs/tutorial/windows-store-guide.md
+++ b/docs/tutorial/windows-store-guide.md
@@ -1,22 +1,42 @@
 # Windows Store Guide
 
-With Windows 8, the good old win32 exectuable got a new sibling: The Universial Windows Platform. The new `.appx` format does not only enable a number of new powerful APIs like Cortana or Push Notifications, but through the Windows Store, also simplifies installation and updating.
+With Windows 8, the good old win32 executable got a new sibling: The Universal
+Windows Platform. The new `.appx` format does not only enable a number of new
+powerful APIs like Cortana or Push Notifications, but through the Windows Store,
+also simplifies installation and updating.
 
-Microsoft [developed a tool that compiles Electron apps as `.appx` packages](http://github.com/catalystcode/electron-windows-store), enabling developers to use some of the goodies found in the new application model. This guide explains how to use it - and what the capabilities and limitations of an Electron AppX package are.
+Microsoft [developed a tool that compiles Electron apps as `.appx` packages](http://github.com/catalystcode/electron-windows-store),
+enabling developers to use some of the goodies found in the new application
+model. This guide explains how to use it - and what the capabilities and
+limitations of an Electron AppX package are.
 
 ## Background and Requirements
 
-Windows 10 "Anniversary Update" is able to run win32 `.exe` binaries by launching them together with a virtualized filesystem and registry. Both are created during compilation by running app and installer inside a Windows Container, allowing Windows to identify exactly which modifications to the operating system are done during installation. Pairing the executable with a virtual filesystem and a virtual registry allows Windows to enable one-click installation and uninstallation.
+Windows 10 "Anniversary Update" is able to run win32 `.exe` binaries by
+launching them together with a virtualized filesystem and registry. Both are
+created during compilation by running app and installer inside a Windows
+Container, allowing Windows to identify exactly which modifications to the
+operating system are done during installation. Pairing the executable with a
+virtual filesystem and a virtual registry allows Windows to enable one-click
+installation and uninstallation.
 
-In addition, the exe is launched inside the appx model - meaning that it can use many of the APIs available to the Universial Windows Platform. To gain even more capabilities, an Electron app can pair up with an invisible UWP app launched together with the `exe` - sort of launched as a sidekick to run tasks in the background, receive push notifications, or to communicate with other UWP applications.
+In addition, the exe is launched inside the appx model - meaning that it can use
+many of the APIs available to the Universal Windows Platform. To gain even more
+capabilities, an Electron app can pair up with an invisible UWP app launched
+together with the `exe` - sort of launched as a sidekick to run tasks in the
+background, receive push notifications, or to communicate with other UWP
+applications.
 
-To compile any existing Electron app, ensure that you have the following requirements:
+To compile any existing Electron app, ensure that you have the following
+requirements:
+
+* Windows 10 Anniversary Update - Enterprise Edition (This is build 14316 and up
+  - as of May 2016, it's part of the Windows Insiders Preview)
+* A machine with 64 bit (x64) processor, Hardware-Assisted Virtualization, and
+  Second Level Address Translation (SLAT)
+* The Windows 10 SDK, [downloadable here](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
+* At least Node 4 (to check, run `node -v`)
 
- * Windows 10 Anniversary Update - Enterprise Edition (This is build 14316 and up - as of May 2016, it's part of the Windows Insiders Preview)
- * A machine with 64 bit (x64) processor, Hardware-Assisted Virtualization, and Second Level Address Translation (SLAT)
- * The Windows 10 SDK, [downloadable here](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
- * At least Node 4 (to check, run `node -v`)
- 
 Then, go and install the `electron-windows-store` CLI:
 
 ```
@@ -25,17 +45,30 @@ npm install -g electron-windows-store
 
 ## Setup and Preparation
 
-Before running the CLI for the first time, you will have to setup the "Windows Desktop App Converter". This will take a few minutes, but don't worry - you only have to do this once. Download and Desktop App Converter from [here](https://www.microsoft.com/en-us/download/details.aspx?id=51691). You will receive two files: `DesktopAppConverter.zip` and `BaseImage-14316.wim`.
+Before running the CLI for the first time, you will have to setup the "Windows
+Desktop App Converter". This will take a few minutes, but don't worry - you only
+have to do this once. Download and Desktop App Converter from
+[here](https://www.microsoft.com/en-us/download/details.aspx?id=51691). You will
+receive two files: `DesktopAppConverter.zip` and `BaseImage-14316.wim`.
 
-1. Unzip `DesktopAppConverter.zip`. From an elevated PowerShell (opened with "run as Administrator", ensure that your systems execution policy allows us to run everything we intend to run by calling `Set-ExecutionPolicy bypass`.
-2. Then, run the installation of the Desktop App Converter, passing in the location of the Windows base Image (downloaded as `BaseImage-14316.wim`), by calling `.\DesktopAppConverter.ps1 -Setup -BaseImage .\BaseImage-14316.wim`.
-3. If running the above command prompts you for a reboot, please restart your machine and run the above command again after a successful restart.
+1. Unzip `DesktopAppConverter.zip`. From an elevated PowerShell (opened with
+  "run as Administrator", ensure that your systems execution policy allows us to
+  run everything we intend to run by calling `Set-ExecutionPolicy bypass`.
+2. Then, run the installation of the Desktop App Converter, passing in the
+  location of the Windows base Image (downloaded as `BaseImage-14316.wim`), by
+  calling `.\DesktopAppConverter.ps1 -Setup -BaseImage .\BaseImage-14316.wim`.
+3. If running the above command prompts you for a reboot, please restart your
+  machine and run the above command again after a successful restart.
 
 Once installation succeeded, you can move on to compiling your Electron app.
 
 ## Package Your Electron Application
 
-Package the application using [electron-packager](https://github.com/electron-userland/electron-packager) (or a similar tool). Make sure to remove `node_modules` that you don't need in your final application, since any module you don't actually need will just increase your application's size.
+Package the application using
+[electron-packager](https://github.com/electron-userland/electron-packager)
+(or a similar tool). Make sure to remove `node_modules` that you don't need in
+your final application, since any module you don't actually need will just
+increase your application's size.
 
 The output should look roughly like this:
 
@@ -70,7 +103,10 @@ The output should look roughly like this:
 
 ## Running the Command Line Tool
 
-From an elevated PowerShell (run it "as Administrator"), run `electron-windows-store` with the required parameters, passing both the input and output directories, the app's name and version, and confirmation that `node_modules` should be flattened.
+From an elevated PowerShell (run it "as Administrator"), run
+`electron-windows-store` with the required parameters, passing both the input
+and output directories, the app's name and version, and confirmation that
+`node_modules` should be flattened.
 
 ```
 electron-windows-store `
@@ -81,12 +117,26 @@ electron-windows-store `
     --package-name myelectronapp
 ```
 
-Once executed, the tool goes to work: It accepts your Electron app as an input, flattening the `node_modules`. Then, it archives your application as `app.zip`. Using an installer and a Windows Container, the tool creates an "expanded" AppX package - including the Windows Application Manifest (`AppXManifest.xml`) as well as the virtual file system and the virtual registry inside your output folder.
+Once executed, the tool goes to work: It accepts your Electron app as an input,
+flattening the `node_modules`. Then, it archives your application as `app.zip`.
+Using an installer and a Windows Container, the tool creates an "expanded" AppX
+package - including the Windows Application Manifest (`AppXManifest.xml`) as
+well as the virtual file system and the virtual registry inside your output
+folder.
 
-Once the expanded AppX files are created, the tool uses the Windows App Packager (`MakeAppx.exe`) to create a single-file AppX package from those files on disk. Finally, the tool can be used to create a trusted certificate on your computer to sign the new AppX pacakge. With the signed AppX package, the CLI can also automatically install the package on your machine.
+Once the expanded AppX files are created, the tool uses the Windows App Packager
+(`MakeAppx.exe`) to create a single-file AppX package from those files on disk.
+Finally, the tool can be used to create a trusted certificate on your computer
+to sign the new AppX pacakge. With the signed AppX package, the CLI can also
+automatically install the package on your machine.
 
 ## Using the AppX Package
 
-Since the Windows Anniversary Update (codenamed Windows Redstone) has not been released to consumers yet, you won't be able to release your app to the Windows Store until later this year - but you can already use the `Add-AppxPackage` [PowerShell Cmdlet to install it on machines](https://technet.microsoft.com/en-us/library/hh856048.aspx) in developer or enterprise environments.
+Since the Windows Anniversary Update (codenamed Windows Redstone) has not been
+released to consumers yet, you won't be able to release your app to the Windows
+Store until later this year - but you can already use the `Add-AppxPackage`
+[PowerShell Cmdlet to install it on machines](https://technet.microsoft.com/en-us/library/hh856048.aspx)
+in developer or enterprise environments.
 
-Another important limitation is that the compiled AppX package still contains a win32 executable - and will therefore not run on Xbox, HoloLens, or Phones.
+Another important limitation is that the compiled AppX package still contains a
+win32 executable - and will therefore not run on Xbox, HoloLens, or Phones.

From e1bf0ea2b41fec63be14697a8668ffeb0f44c95a Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Thu, 19 May 2016 18:28:24 +0900
Subject: [PATCH 275/510] :memo: Adjust line length to `80`

[ci skip]
---
 docs/tutorial/electron-versioning.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/tutorial/electron-versioning.md b/docs/tutorial/electron-versioning.md
index b30fa94fc832..10e9679b0bd9 100644
--- a/docs/tutorial/electron-versioning.md
+++ b/docs/tutorial/electron-versioning.md
@@ -1,11 +1,21 @@
 # Electron Versioning
 
-If you are a seasoned Node developer, you are surely aware of `semver` - and might be used to giving your dependency management systems only rough guidelines rather than fixed version numbers. Due to the hard dependency on Node and Chromium, Electron is in a slightly more difficult position and does not follow semver. You should therefor always reference a specific version of Electron.
+If you are a seasoned Node developer, you are surely aware of `semver` - and
+might be used to giving your dependency management systems only rough guidelines
+rather than fixed version numbers. Due to the hard dependency on Node and
+Chromium, Electron is in a slightly more difficult position and does not follow
+semver. You should therefor always reference a specific version of Electron.
 
 Version numbers are bumped using the following rules:
 
- * Major: For breaking changes in Electron's API - if you upgrade from `0.37.0` to `1.0.0`, you will have to update your app.
- * Minor: For major Chrome and minor Node upgrades; or significant Electron changes - if you upgrade from `1.0.0` to `1.1.0`, your app is supposed to still work, but you might have to work around small changes.
- * Patch: For new features and bug fixes - if you upgrade from `1.0.0` to `1.0.1`, your app will continue to work as-is.
- 
-If you are using `electron-prebuilt`, we recommend that you set a fixed version number (`1.1.0` instead of `^1.1.0`) to ensure that all upgrades of Electron are a manual operation made by you, the developer.
+* Major: For breaking changes in Electron's API - if you upgrade from `0.37.0`
+  to `1.0.0`, you will have to update your app.
+* Minor: For major Chrome and minor Node upgrades; or significant Electron
+  changes - if you upgrade from `1.0.0` to `1.1.0`, your app is supposed to
+  still work, but you might have to work around small changes.
+* Patch: For new features and bug fixes - if you upgrade from `1.0.0` to
+  `1.0.1`, your app will continue to work as-is.
+
+If you are using `electron-prebuilt`, we recommend that you set a fixed version
+number (`1.1.0` instead of `^1.1.0`) to ensure that all upgrades of Electron are
+a manual operation made by you, the developer.

From 9cbcd228f3ebb4d51d16322b972d57c43ac291b5 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Thu, 19 May 2016 18:32:43 +0900
Subject: [PATCH 276/510] :memo: Adjust line length to `80`

[ci skip]
---
 docs/api/app.md          | 34 +++++++++++++++++++++-------------
 docs/api/auto-updater.md |  3 ++-
 docs/api/dialog.md       |  3 ++-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 262d0ee44e50..f00b498d30c3 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -34,10 +34,12 @@ Emitted when Electron has finished initialization.
 
 Emitted when all windows have been closed.
 
-If you do not subscribe to this event and all windows are closed, the default behavior is to quit the app; however, if you subscribe, you control whether the app quits or not. If the
-user pressed `Cmd + Q`, or the developer called `app.quit()`, Electron will
-first try to close all the windows and then emit the `will-quit` event, and in
-this case the `window-all-closed` event would not be emitted.
+If you do not subscribe to this event and all windows are closed, the default
+behavior is to quit the app; however, if you subscribe, you control whether the
+app quits or not. If the user pressed `Cmd + Q`, or the developer called
+`app.quit()`, Electron will first try to close all the windows and then emit the
+`will-quit` event, and in this case the `window-all-closed` event would not be
+emitted.
 
 ### Event: 'before-quit'
 
@@ -87,7 +89,8 @@ handle this case (even before the `ready` event is emitted).
 
 You should call `event.preventDefault()` if you want to handle this event.
 
-On Windows, you have to parse `process.argv` (in the main process) to get the filepath.
+On Windows, you have to parse `process.argv` (in the main process) to get the
+filepath.
 
 ### Event: 'open-url' _OS X_
 
@@ -108,8 +111,8 @@ Returns:
 * `event` Event
 * `hasVisibleWindows` Boolean
 
-Emitted when the application is activated, which usually happens when the user clicks on
-the application's dock icon.
+Emitted when the application is activated, which usually happens when the user
+clicks on the application's dock icon.
 
 ### Event: 'continue-activity' _OS X_
 
@@ -251,7 +254,8 @@ Emitted when the gpu process crashes.
 
 The `app` object has the following methods:
 
-**Note:** Some methods are only available on specific operating systems and are labeled as such.
+**Note:** Some methods are only available on specific operating systems and are
+labeled as such.
 
 ### `app.quit()`
 
@@ -283,7 +287,8 @@ Hides all application windows without minimizing them.
 
 ### `app.show()` _OS X_
 
-Shows application windows after they were hidden. Does not automatically focus them.
+Shows application windows after they were hidden. Does not automatically focus
+them.
 
 ### `app.getAppPath()`
 
@@ -397,8 +402,8 @@ The API uses the Windows Registry and LSSetDefaultHandlerForURLScheme internally
 
 * `protocol` String - The name of your protocol, without `://`.
 
-This method checks if the current executable as the default handler for a protocol
-(aka URI scheme). If so, it will remove the app as the default handler.
+This method checks if the current executable as the default handler for a
+protocol (aka URI scheme). If so, it will remove the app as the default handler.
 
 ### `app.isDefaultProtocolClient(protocol)` _OS X_ _Windows_
 
@@ -407,8 +412,11 @@ This method checks if the current executable as the default handler for a protoc
 This method checks if the current executable is the default handler for a protocol
 (aka URI scheme). If so, it will return true. Otherwise, it will return false.
 
-**Note:** On OS X, you can use this method to check if the app has been registered as the default protocol handler for a protocol. You can also verify this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the OS X machine.
-Please refer to [Apple's documentation][LSCopyDefaultHandlerForURLScheme] for details.
+**Note:** On OS X, you can use this method to check if the app has been
+registered as the default protocol handler for a protocol. You can also verify
+this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the
+OS X machine. Please refer to
+[Apple's documentation][LSCopyDefaultHandlerForURLScheme] for details.
 
 The API uses the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
 
diff --git a/docs/api/auto-updater.md b/docs/api/auto-updater.md
index 66ddbca96560..cb6403a273e6 100644
--- a/docs/api/auto-updater.md
+++ b/docs/api/auto-updater.md
@@ -2,7 +2,8 @@
 
 > Enable apps to automatically update themselves.
 
-The `autoUpdater` module provides an interface for the [Squirrel](https://github.com/Squirrel) framework.
+The `autoUpdater` module provides an interface for the
+[Squirrel](https://github.com/Squirrel) framework.
 
 You can quickly launch a multi-platform release server for distributing your
 application by using one of these projects:
diff --git a/docs/api/dialog.md b/docs/api/dialog.md
index 3681a66d7bf6..c276f2e2d5b7 100644
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -92,7 +92,8 @@ will be passed via `callback(filename)`
   * `type` String - Can be `"none"`, `"info"`, `"error"`, `"question"` or
   `"warning"`. On Windows, "question" displays the same icon as "info", unless
   you set an icon using the "icon" option.
-  * `buttons` Array - Array of texts for buttons. On Windows, an empty array will result in one button labeled "OK".
+  * `buttons` Array - Array of texts for buttons. On Windows, an empty array
+    will result in one button labeled "OK".
   * `defaultId` Integer - Index of the button in the buttons array which will
     be selected by default when the message box opens.
   * `title` String - Title of the message box, some platforms will not show it.

From 3ee9eef308da8cd77dfa50da316c5bd388026156 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Thu, 19 May 2016 18:34:08 +0900
Subject: [PATCH 277/510] :memo: Remove unused link

[ci skip]
---
 docs/api/synopsis.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api/synopsis.md b/docs/api/synopsis.md
index 8ed43b04ebf6..a83ffc41f7b9 100644
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -74,4 +74,3 @@ const BrowserWindow = electron.BrowserWindow;
 
 [gui]: https://en.wikipedia.org/wiki/Graphical_user_interface
 [destructuring-assignment]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment
-[issue-387]: https://github.com/electron/electron/issues/387

From d6ab81c1da4630e88f8996dc79c3bb3dda264832 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Thu, 19 May 2016 18:36:26 +0900
Subject: [PATCH 278/510] :memo: Fix link to improve readability

[ci skip]
---
 docs/tutorial/mac-app-store-submission-guide.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/tutorial/mac-app-store-submission-guide.md b/docs/tutorial/mac-app-store-submission-guide.md
index 28c5ab64f120..c6ae061bd762 100644
--- a/docs/tutorial/mac-app-store-submission-guide.md
+++ b/docs/tutorial/mac-app-store-submission-guide.md
@@ -22,9 +22,9 @@ Apple. You can follow these [existing guides][nwjs-guide] on web.
 ### Get Team ID
 
 Before signing your app, you need to know the Team ID of your account. To locate
-your Team ID, Sign in to https://developer.apple.com/account/, and click
-Membership in the sidebar. Your Team ID appears in the Membership Information
-section under the team name.
+your Team ID, Sign in to [Apple Developer Center](https://developer.apple.com/account/),
+and click Membership in the sidebar. Your Team ID appears in the Membership
+Information section under the team name.
 
 ### Sign Your App
 

From 195e0e64d0c6f2189078bb110193378a40f615b1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 19:22:32 +0900
Subject: [PATCH 279/510] Update brightray for #5578

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index bf56e3a38f50..5c0307a81008 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit bf56e3a38f50a2b12d28f8b3bf8adb7dc628f671
+Subproject commit 5c0307a810088a112d44a452a29baaaa36cd9b42

From e488320d37bcfde20874adbda4d93aeda50f2cbb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 19:23:02 +0900
Subject: [PATCH 280/510] Ignore failures of OS X on Travis CI

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b4343138994..75a5a26c6c71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,7 @@ matrix:
     - os: linux
       env: TARGET_ARCH=ia32
   allow_failures:
-    - env: TARGET_ARCH=arm
-    - env: TARGET_ARCH=ia32
+    - os: osx
 
 script: './script/cibuild'
 

From 983d611e96d238efd41bacc799565e68567f4763 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 19 May 2016 20:12:56 +0900
Subject: [PATCH 281/510] Cleanup the docs of process object

---
 atom/common/api/atom_bindings.cc | 28 ++++++-------
 docs/api/process.md              | 69 ++++++++++++++++++++------------
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index 6b75ddd975df..f567492b52ba 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -34,14 +34,14 @@ void Hang() {
 }
 
 v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
   std::unique_ptr<base::ProcessMetrics> metrics(
-    base::ProcessMetrics::CreateCurrentProcessMetrics());
+      base::ProcessMetrics::CreateCurrentProcessMetrics());
 
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
   dict.Set("workingSetSize",
-    static_cast<double>(metrics->GetWorkingSetSize() >> 10));
+           static_cast<double>(metrics->GetWorkingSetSize() >> 10));
   dict.Set("peakWorkingSetSize",
-    static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
+           static_cast<double>(metrics->GetPeakWorkingSetSize() >> 10));
 
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
@@ -52,24 +52,22 @@ v8::Local<v8::Value> GetProcessMemoryInfo(v8::Isolate* isolate) {
   return dict.GetHandle();
 }
 
-v8::Local<v8::Value> GetSystemMemoryInfo(
-    v8::Isolate* isolate,
-    mate::Arguments* args) {
-  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-  base::SystemMemoryInfoKB memInfo;
-
-  if (!base::GetSystemMemoryInfo(&memInfo)) {
+v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
+                                         mate::Arguments* args) {
+  base::SystemMemoryInfoKB mem_info;
+  if (!base::GetSystemMemoryInfo(&mem_info)) {
     args->ThrowError("Unable to retrieve system memory information");
     return v8::Undefined(isolate);
   }
 
-  dict.Set("total", memInfo.total);
-  dict.Set("free", memInfo.free);
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+  dict.Set("total", mem_info.total);
+  dict.Set("free", mem_info.free);
 
   // NB: These return bogus values on OS X
 #if !defined(OS_MACOSX)
-  dict.Set("swapTotal", memInfo.swap_total);
-  dict.Set("swapFree", memInfo.swap_free);
+  dict.Set("swapTotal", mem_info.swap_total);
+  dict.Set("swapFree", mem_info.swap_free);
 #endif
 
   return dict.GetHandle();
diff --git a/docs/api/process.md b/docs/api/process.md
index a7740327d68d..37cc81f76a85 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -1,23 +1,9 @@
 # process
 
-> Get information about the running application process.
+> Extensions to process object.
 
-The `process` object in Electron has the following differences from the one in
-upstream node:
+The `process` object is extended in Electron with following APIs:
 
-* `process.type` String - Process's type, can be `browser` (i.e. main process)
-  or `renderer`.
-* `process.versions.electron` String - Version of Electron.
-* `process.versions.chrome` String - Version of Chromium.
-* `process.resourcesPath` String - Path to JavaScript source code.
-* `process.mas` Boolean - For Mac App Store build, this value is `true`, for
-  other builds it is `undefined`.
-* `process.windowsStore` Boolean - If the app is running as a Windows Store app
-  (appx), this value is `true`, for other builds it is `undefined`.
-* `process.defaultApp` Boolean - When app is started by being passed as
-  parameter to the default app, this value is `true` in the main process,
-  otherwise it is `undefined`.
-  
 ## Events
 
 ### Event: 'loaded'
@@ -45,6 +31,37 @@ process.once('loaded', () => {
 Setting this to `true` can disable the support for `asar` archives in Node's
 built-in modules.
 
+### `process.type`
+
+Current process's type, can be `"browser"` (i.e. main process) or `"renderer"`.
+
+### `process.versions.electron`
+
+Electron's version string.
+
+### `process.versions.chrome`
+
+Chrome's version string.
+
+### `process.resourcesPath`
+
+Path to the resources directory.
+
+### `process.mas`
+
+For Mac App Store build, this property is `true`, for other builds it is
+`undefined`.
+
+### `process.windowsStore`
+
+If the app is running as a Windows Store app (appx), this property is `true`,
+for otherwise it is `undefined`.
+
+### `process.defaultApp`
+
+When app is started by being passed as parameter to the default app, this
+property is `true` in the main process, otherwise it is `undefined`.
+
 ## Methods
 
 The `process` object has the following method:
@@ -64,33 +81,33 @@ Causes the main thread of the current process hang.
 Sets the file descriptor soft limit to `maxDescriptors` or the OS hard
 limit, whichever is lower for the current process.
 
-### getProcessMemoryInfo()
+### `process.getProcessMemoryInfo()`
 
-Return an object giving memory usage statistics about the current process. Note
+Returns an object giving memory usage statistics about the current process. Note
 that all statistics are reported in Kilobytes.
 
 * `workingSetSize` - The amount of memory currently pinned to actual physical
-  RAM
+  RAM.
 * `peakWorkingSetSize` - The maximum amount of memory that has ever been pinned
-  to actual physical RAM
+  to actual physical RAM.
 * `privateBytes` - The amount of memory not shared by other processes, such as
   JS heap or HTML content.
 * `sharedBytes` - The amount of memory shared between processes, typically
   memory consumed by the Electron code itself
 
-### getSystemMemoryInfo()
+### `process.getSystemMemoryInfo()`
 
-Return an object giving memory usage statistics about the entire system. Note
+Returns an object giving memory usage statistics about the entire system. Note
 that all statistics are reported in Kilobytes.
 
 * `total` - The total amount of physical memory in Kilobytes available to the
-  system
+  system.
 * `free` - The total amount of memory not being used by applications or disk
-  cache
+  cache.
 
 On Windows / Linux:
 
 * `swapTotal` - The total amount of swap memory in Kilobytes available to the
-  system
+  system.
 * `swapFree` - The free amount of swap memory in Kilobytes available to the
-  system
+  system.

From 836e2e4e91859b33b0d748192980c9cfe02cad59 Mon Sep 17 00:00:00 2001
From: Sergey <gaserd123@gmail.com>
Date: Thu, 19 May 2016 16:46:42 +0300
Subject: [PATCH 282/510] docs : Russian

Russian language for http://electron.atom.io/docs/tutorial/mac-app-store-submission-guide/
---
 .../mac-app-store-submission-guide.md         | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 docs-translations/ru-RU/tutorial/mac-app-store-submission-guide.md

diff --git a/docs-translations/ru-RU/tutorial/mac-app-store-submission-guide.md b/docs-translations/ru-RU/tutorial/mac-app-store-submission-guide.md
new file mode 100644
index 000000000000..480ec35f760b
--- /dev/null
+++ b/docs-translations/ru-RU/tutorial/mac-app-store-submission-guide.md
@@ -0,0 +1,145 @@
+
+#Руководство по утверждению вашего приложения в App Store
+
+Начиная с версии v0.34.0 Electron позволяет вам сформировать данные для App Store к вашему приложению.
+Данное руководство представляет собой пошаговую инструкцию по созданию данных файлов.
+
+Помните, что когда Вы подаете свое приложение на рассмотрение в App Store Вы должны обладать аккаунтом разработчика,
+который стоит денег.
+
+## Как отправить свое приложение на рассмотрение в App Store
+
+Последующие шаги подробно описывают, что и в какой последовательности Вам требуется сделать, но не гарантируют что Ваше приложение 
+будет рассмотрено Apple. Мы так же рекомендуем вам прочитать официальную документацию по оформлению своего приложения и информации к нему
+чтобы пройти проверку в App Store.
+
+## Получение сертификата
+
+Перед тем, как отправить свое приложение Вы должны получить сертефикат, как это описано в этом [руководстве](https://github.com/nwjs/nw.js/wiki/Mac-App-Store-%28MAS%29-Submission-Guideline#first-steps "Ссылка на руководство")
+
+## Регистрируем свое приложение (подписываем)
+
+После того, как Вы получили сертефикат, Вы можете упаковать свое прилоежние следуя правилам Application Distribution, 
+а затем подписать свое приложение. Этот шаг является базовым, но подписывать свое приложение нам нужно всего лишь один раз.
+
+Во-первых, нам нужно подготовить два файла:
+
+  child.plist:
+    
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+      <dict>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.inherit</key>
+        <true/>
+      </dict>
+    </plist>
+  
+  parent.plist:
+  
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+      <dict>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.temporary-exception.sbpl</key>
+        <string>(allow mach-lookup (global-name-regex #"^org.chromium.Chromium.rohitfork.[0-9]+$"))</string>
+      </dict>
+    </plist>
+
+Затем подписываем свое приложение, с помощью специального сценария:
+    #!/bin/bash
+
+    # Имя вашего приложения.
+    APP="YourApp"
+    # Путь до вашейго приложения.
+    APP_PATH="/path/to/YourApp.app"
+    # Путь до вашего установочного пакета.
+    RESULT_PATH="~/Desktop/$APP.pkg"
+    # Имя сертификата которое вы хотите.
+    APP_KEY="3rd Party Mac Developer Application: Company Name (APPIDENTITY)"
+    INSTALLER_KEY="3rd Party Mac Developer Installer: Company Name (APPIDENTITY)"
+    
+    FRAMEWORKS_PATH="$APP_PATH/Contents/Frameworks"
+    
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Electron Framework"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libnode.dylib"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/Contents/MacOS/$APP Helper"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/Contents/MacOS/$APP Helper EH"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/Contents/MacOS/$APP Helper NP"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/"
+    codesign -s "$APP_KEY" -f --entitlements child.plist "$APP_PATH/Contents/MacOS/$APP"
+    codesign -s "$APP_KEY" -f --entitlements parent.plist "$APP_PATH"
+    
+    productbuild --component "$APP_PATH" /Applications --sign "$INSTALLER_KEY" "$RESULT_PATH"
+    
+Если вы только начали разрабатывать под Mac OS X, то мы желаем Вам прочитать [App SandBox](https://developer.apple.com/library/ios/documentation/Miscellaneous/Reference/EntitlementKeyReference/Chapters/EnablingAppSandbox.html "Ссылка для новичков в разработке приложений для Mac OS X")
+
+##  Обновление приложения
+
+После того, как Вы подписали свое приложение вы сможете загрузить его в Itunes Connect для обработки, убедитесь, что вы создали [запись](https://developer.apple.com/library/ios/documentation/LanguagesUtilities/Conceptual/iTunesConnect_Guide/Chapters/CreatingiTunesConnectRecord.html "ссылка на показ как создавать запись в Itunes Connect") перед отправкой.
+
+## Объяснение использования 'temporary-exception'
+
+Когда песочница Apple временно исключила ваше приложение, согласно [документации](https://developer.apple.com/library/mac/documentation/Miscellaneous/Reference/EntitlementKeyReference/Chapters/AppSandboxTemporaryExceptionEntitlements.html "Документация по исключениям") вам нужно объяснить насколько это важное исключение:
+
+>Примечание: если вы временно исключаете свое приложение, обязательно прочитайте и выполните рекомендации по правам на исключение.
+>которые предоставляются в Itunes Connect. Самое важное указать почему ваше приложение должно быть исключенно.
+
+Вы можете объяснить, что ваше приложение построено на основе браузера Chromium, который использует Mach из-за его мульти-процесс архитектуры. Но есть еще вероятность, что ваше приложение не удалось проверить именно из-за этого.
+
+## Отправка приложения на проверку
+
+Следующие шаги описаны в официальной [документации](https://developer.apple.com/library/ios/documentation/LanguagesUtilities/Conceptual/iTunesConnect_Guide/Chapters/SubmittingTheApp.html "Официальная статья по отправке приложения на проверку")
+
+#Ограничения в Mac App Store
+
+Для того чтобы удовлетворить всем просьбам SandBox App Store , некотоыре из модулей были отключены:
+- crashReporter
+- autoUpdater
+и следующие проблемы были несколько изменены:
+- Захват видео на некоторых машинах может не работать
+- Некоторые специалньые возможности могут не работать
+- Приложения не будут в курсе изменения DNS
+Так же из за использования SandBox App Store некоторые возможности могут быть не доступны или ограничены, подробнее о ограничениях 
+Вы можете прочитать в [документации](https://developer.apple.com/app-sandboxing/ "Ссылка на ограничения в SandBox AppStore")
+
+# Криптографические алгоритмы котоыре использует Electron
+
+Смотря в какой стране и городе Вы находитесь Apple может потребовать от Вас задокументировать алгоритмы криптографии котоыре вы используете
+и если потребуется то попросит предоставить Вас копию регистрации вашего алгоритма шифрования.
+
+Electron использует следующие алгоритмы шифрования:
+- AES - NIST SP 800-38A, NIST SP 800-38D, RFC 3394
+- HMAC - FIPS 198-1
+- ECDSA - ANS X9.62–2005
+- ECDH - ANS X9.63–2001
+- HKDF - NIST SP 800-56C
+- PBKDF2 - RFC 2898
+- RSA - RFC 3447
+- SHA - FIPS 180-4
+- Blowfish - https://www.schneier.com/cryptography/blowfish/
+- CAST - RFC 2144, RFC 2612
+- DES - FIPS 46-3
+- DH - RFC 2631
+- DSA - ANSI X9.30
+- EC - SEC 1
+- IDEA - “On the Design and Security of Block Ciphers” book by X. Lai
+- MD2 - RFC 1319
+- MD4 - RFC 6150
+- MD5 - RFC 1321
+- MDC2 - ISO/IEC 10118-2
+- RC2 - RFC 2268
+- RC4 - RFC 4345
+- RC5 - http://people.csail.mit.edu/rivest/Rivest-rc5rev.pdf
+- RIPEMD - ISO/IEC 10118-3
+
+Если Вы используете необычный алгоритм, то вот статья о том как получить разрешение на использование собственного алгоритма шифрования в
+рамках закона США - [статья](https://pupeno.com/2015/12/15/legally-submit-app-apples-app-store-uses-encryption-obtain-ern/ "Статья о том как получить разрешение на свой алгоритм шифрования")

From e87ced60e582a3234c990b49a7412ff06271dd59 Mon Sep 17 00:00:00 2001
From: Matt Karl <matt.karl@jibo.com>
Date: Thu, 19 May 2016 10:33:22 -0400
Subject: [PATCH 283/510] The "Error opening app" dialog, now with less
 attitude

---
 default_app/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default_app/main.js b/default_app/main.js
index 8eaae8e65f38..f4ca5f14a657 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -255,7 +255,7 @@ function loadApplicationPackage (packagePath) {
       app.focus()
       dialog.showErrorBox(
         'Error opening app',
-        'The app provided is not a valid Electron app, please read the docs on how to write one:\n' +
+        'Unable to open or find an Electron app. The docs on how to write an app can be found here:\n' +
         `https://github.com/electron/electron/tree/v${process.versions.electron}/docs
 
 ${e.toString()}`

From 2bade868bb75cf52e4eda1ba40e53fa56110fe27 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Thu, 19 May 2016 09:31:02 -0700
Subject: [PATCH 284/510] Update remote.md to mention enumerable property
 limitation

#5599
---
 docs/api/remote.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/api/remote.md b/docs/api/remote.md
index bf82badca74a..52f7208b8b0b 100644
--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -37,7 +37,8 @@ process. Instead, it created a `BrowserWindow` object in the main process and
 returned the corresponding remote object in the renderer process, namely the
 `win` object.
 
-Please note that only [enumerable properties](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Enumerability_and_ownership_of_properties) are accessible via remote.
+Please note that only [enumerable properties](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Enumerability_and_ownership_of_properties) which are present when the remote object is first referenced are
+accessible via remote.
 
 ## Lifetime of Remote Objects
 

From 1a27ecdad41ba0854a8a890774e1ec67c83ee427 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jviottidc@gmail.com>
Date: Thu, 19 May 2016 11:08:08 -0400
Subject: [PATCH 285/510] Override `child_process.execFile` asar patch for
 `child_process.exec`

NodeJS implements `child_process.exec` by simply passing the whole
command to `child_process.execFile`. See:

- https://github.com/nodejs/node/blob/master/lib/child_process.js#L90
- https://github.com/nodejs/node/blob/master/lib/child_process.js#L99

Electron patches `child_process.execFile` to add support for `asar`
archives by injecting logic that extracts the required files from the
`asar` to a temporary location before delegating the work to the
original `child_process.execFile`.

In order to decide whether to inject the custom `asar` extracting logic,
Electron makes use of a helper function called `splitPath()`. See:

- https://github.com/electron/electron/blob/master/lib/common/asar.js#L37

If the first argument of the returned array equals `true`, means that
the path is considered to be an `asar` archive, and thus the extraction
logic takes place. The problem is that if the command passed to
`child_process.execFile` *contains* a path to an asar archive, padded
with other commands/arguments, `splitPath()` will consider it to be an
`asar` archive, and will try to extract it, throwing a rightfully
`Invalid package` error.

Fixes: https://github.com/electron/electron/issues/5571
Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
---
 lib/common/asar.js | 17 +++++++++++++++++
 spec/asar-spec.js  | 24 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/lib/common/asar.js b/lib/common/asar.js
index 262412813221..1d8474d1c563 100644
--- a/lib/common/asar.js
+++ b/lib/common/asar.js
@@ -589,6 +589,23 @@
         return mkdirSync(p, mode)
       }
     }
+
+    // Executing a command string containing a path to an asar
+    // archive confuses `child_process.execFile`, which is internally
+    // called by `child_process.{exec,execSync}`, causing
+    // Electron to consider the full command as a single path
+    // to an archive.
+    [ 'exec', 'execSync' ].forEach(function (functionName) {
+      var old = child_process[functionName]
+      child_process[functionName] = function () {
+        var processNoAsarOriginalValue = process.noAsar
+        process.noAsar = true
+        var result = old.apply(this, arguments)
+        process.noAsar = processNoAsarOriginalValue
+        return result
+      }
+    })
+
     overrideAPI(fs, 'open')
     overrideAPI(child_process, 'execFile')
     overrideAPISync(process, 'dlopen', 1)
diff --git a/spec/asar-spec.js b/spec/asar-spec.js
index f9c4e98ae8fa..ac0779d2f266 100644
--- a/spec/asar-spec.js
+++ b/spec/asar-spec.js
@@ -555,6 +555,30 @@ describe('asar package', function () {
       })
     })
 
+    describe('child_process.exec', function () {
+      var child_process = require('child_process');
+      var echo = path.join(fixtures, 'asar', 'echo.asar', 'echo')
+
+      it('should not try to extract the command if there is a reference to a file inside an .asar', function (done) {
+        child_process.exec('echo ' + echo + ' foo bar', function (error, stdout) {
+          assert.equal(error, null)
+          assert.equal(stdout.toString().replace(/\r/g, ''), echo + ' foo bar\n')
+          done()
+        })
+      })
+    })
+
+    describe('child_process.execSync', function () {
+      var child_process = require('child_process');
+      var echo = path.join(fixtures, 'asar', 'echo.asar', 'echo')
+
+      it('should not try to extract the command if there is a reference to a file inside an .asar', function (done) {
+        var stdout = child_process.execSync('echo ' + echo + ' foo bar')
+        assert.equal(stdout.toString().replace(/\r/g, ''), echo + ' foo bar\n')
+        done()
+      })
+    })
+
     describe('child_process.execFile', function () {
       var echo, execFile, execFileSync, ref2
       if (process.platform !== 'darwin') {

From fef2f789cddd2a81463234bf8c2672826c733837 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 19 May 2016 13:42:48 -0700
Subject: [PATCH 286/510] :art:

---
 lib/renderer/web-view/web-view.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index bfe5197295c0..605f3be536be 100644
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -47,8 +47,7 @@ var WebViewImpl = (function () {
   WebViewImpl.prototype.createBrowserPluginNode = function () {
     // We create BrowserPlugin as a custom element in order to observe changes
     // to attributes synchronously.
-    var browserPluginNode
-    browserPluginNode = new WebViewImpl.BrowserPlugin()
+    var browserPluginNode = new WebViewImpl.BrowserPlugin()
     v8Util.setHiddenValue(browserPluginNode, 'internal', this)
     return browserPluginNode
   }
@@ -259,8 +258,7 @@ var WebViewImpl = (function () {
 
 // Registers browser plugin <object> custom element.
 var registerBrowserPluginElement = function () {
-  var proto
-  proto = Object.create(HTMLObjectElement.prototype)
+  var proto = Object.create(HTMLObjectElement.prototype)
   proto.createdCallback = function () {
     this.setAttribute('type', 'application/browser-plugin')
     this.setAttribute('id', 'browser-plugin-' + getNextId())

From 4754e4aabbf9488828d86ecc774ebed768d24053 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 19 May 2016 14:32:16 -0700
Subject: [PATCH 287/510] Add zoomFactor to guest params

---
 lib/browser/guest-view-manager.js | 1 +
 lib/renderer/web-view/web-view.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 28768fb128dc..3aae606c4465 100644
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -179,6 +179,7 @@ var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params
     guestInstanceId: guestInstanceId,
     nodeIntegration: (ref1 = params.nodeintegration) != null ? ref1 : false,
     plugins: params.plugins,
+    zoomFactor: params.zoomFactor,
     webSecurity: !params.disablewebsecurity,
     blinkFeatures: params.blinkfeatures
   }
diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index 605f3be536be..1636d560ee53 100644
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -223,7 +223,8 @@ var WebViewImpl = (function () {
     var attribute, attributeName, css, elementRect, params, ref1
     params = {
       instanceId: this.viewInstanceId,
-      userAgentOverride: this.userAgentOverride
+      userAgentOverride: this.userAgentOverride,
+      zoomFactor: webFrame.getZoomFactor()
     }
     ref1 = this.attributes
     for (attributeName in ref1) {

From b09c81202a1c18e4b9c8100dc437a4a69b5f7f6d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 19 May 2016 14:46:11 -0700
Subject: [PATCH 288/510] Add test for webview zoomFactor inheritance

---
 spec/fixtures/pages/webview-zoom-factor.html |  5 +++++
 spec/fixtures/pages/zoom-factor.html         |  8 ++++++++
 spec/webview-spec.js                         | 15 +++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 spec/fixtures/pages/webview-zoom-factor.html
 create mode 100644 spec/fixtures/pages/zoom-factor.html

diff --git a/spec/fixtures/pages/webview-zoom-factor.html b/spec/fixtures/pages/webview-zoom-factor.html
new file mode 100644
index 000000000000..006b416cfef5
--- /dev/null
+++ b/spec/fixtures/pages/webview-zoom-factor.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<webview nodeintegration src="zoom-factor.html"/>
+</body>
+</html>
diff --git a/spec/fixtures/pages/zoom-factor.html b/spec/fixtures/pages/zoom-factor.html
new file mode 100644
index 000000000000..b9f8f988caea
--- /dev/null
+++ b/spec/fixtures/pages/zoom-factor.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<script type="text/javascript" charset="utf-8">
+  const {ipcRenderer, webFrame} = require('electron')
+  ipcRenderer.send('pong', webFrame.getZoomFactor(), webFrame.getZoomLevel())
+</script>
+</body>
+</html>
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 64f0eb5d5248..8a109b6d7bfd 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -852,4 +852,19 @@ describe('<webview> tag', function () {
       document.body.appendChild(webview)
     })
   })
+
+  it('inherits the zoomFactor of the parent window', function (done) {
+    w = new BrowserWindow({
+      show: false,
+      webPreferences: {
+        zoomFactor: 1.2
+      }
+    })
+    ipcMain.once('pong', function (event, zoomFactor, zoomLevel) {
+      assert.equal(zoomFactor, 1.2)
+      assert.equal(zoomLevel, 1)
+      done()
+    })
+    w.loadURL('file://' + fixtures + '/pages/webview-zoom-factor.html')
+  })
 })

From cc7395eea87b751dc4a1ca7369f86edff06fa1ed Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 19 May 2016 15:28:08 -0700
Subject: [PATCH 289/510] Remove returns from event listeners

---
 lib/browser/api/app.js                              |  2 +-
 lib/browser/api/auto-updater/squirrel-update-win.js |  4 ++--
 lib/browser/api/browser-window.js                   |  2 +-
 lib/browser/api/web-contents.js                     |  7 +++----
 lib/browser/desktop-capturer.js                     |  2 +-
 lib/browser/guest-view-manager.js                   | 12 ++++++------
 lib/browser/guest-window-manager.js                 |  8 ++++----
 lib/browser/init.js                                 |  4 ++--
 lib/browser/rpc-server.js                           |  6 +++---
 lib/common/api/deprecate.js                         |  7 +++----
 lib/renderer/api/desktop-capturer.js                |  2 +-
 lib/renderer/api/remote.js                          |  4 ++--
 lib/renderer/inspector.js                           |  2 +-
 lib/renderer/override.js                            |  2 +-
 lib/renderer/web-view/guest-view-internal.js        |  6 +++---
 15 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 291994363648..66ee0ac1e458 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -45,7 +45,7 @@ if (process.platform === 'darwin') {
 const events = ['login', 'certificate-error', 'select-client-certificate']
 for (let name of events) {
   app.on(name, (event, webContents, ...args) => {
-    return webContents.emit.apply(webContents, [name, event].concat(args))
+    webContents.emit.apply(webContents, [name, event].concat(args))
   })
 }
 
diff --git a/lib/browser/api/auto-updater/squirrel-update-win.js b/lib/browser/api/auto-updater/squirrel-update-win.js
index 0910c5f4efbb..121e94226960 100644
--- a/lib/browser/api/auto-updater/squirrel-update-win.js
+++ b/lib/browser/api/auto-updater/squirrel-update-win.js
@@ -55,7 +55,7 @@ var spawnUpdate = function (args, detached, callback) {
   errorEmitted = false
   spawnedProcess.on('error', function (error) {
     errorEmitted = true
-    return callback(error)
+    callback(error)
   })
   return spawnedProcess.on('exit', function (code, signal) {
     spawnedProcess = undefined
@@ -72,7 +72,7 @@ var spawnUpdate = function (args, detached, callback) {
     }
 
     // Success.
-    return callback(null, stdout)
+    callback(null, stdout)
   })
 }
 
diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index a2b31184dc6b..ec61229368d1 100644
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -23,7 +23,7 @@ BrowserWindow.prototype._init = function () {
       width: 800,
       height: 600
     }
-    return ipcMain.emit('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, disposition, options)
+    ipcMain.emit('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, disposition, options)
   })
 
   // window.resizeTo(...)
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index a1d00e7cd9cf..6253f23b3063 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -125,7 +125,7 @@ let wrapWebContents = function (webContents) {
 
   // Dispatch IPC messages to the ipc module.
   webContents.on('ipc-message', function (event, [channel, ...args]) {
-    return ipcMain.emit.apply(ipcMain, [channel, event].concat(args))
+    ipcMain.emit.apply(ipcMain, [channel, event].concat(args))
   })
   webContents.on('ipc-message-sync', function (event, [channel, ...args]) {
     Object.defineProperty(event, 'returnValue', {
@@ -141,9 +141,8 @@ let wrapWebContents = function (webContents) {
 
   // Handle context menu action request from pepper plugin.
   webContents.on('pepper-context-menu', function (event, params) {
-    var menu
-    menu = Menu.buildFromTemplate(params.menu)
-    return menu.popup(params.x, params.y)
+    const menu = Menu.buildFromTemplate(params.menu)
+    menu.popup(params.x, params.y)
   })
 
   // The devtools requests the webContents to reload.
diff --git a/lib/browser/desktop-capturer.js b/lib/browser/desktop-capturer.js
index 21993a9fd71d..da1d481c6052 100644
--- a/lib/browser/desktop-capturer.js
+++ b/lib/browser/desktop-capturer.js
@@ -28,7 +28,7 @@ ipcMain.on('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function (event, cap
 
   // If the WebContents is destroyed before receiving result, just remove the
   // reference from requestsQueue to make the module not send the result to it.
-  return event.sender.once('destroyed', function () {
+  event.sender.once('destroyed', function () {
     request.webContents = null
   })
 })
diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 28768fb128dc..7ccb466fcbef 100644
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -137,7 +137,7 @@ var createGuest = function (embedder, params) {
   // Dispatch events to embedder.
   fn = function (event) {
     return guest.on(event, function (_, ...args) {
-      return embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + guest.viewInstanceId, event].concat(args))
+      embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + guest.viewInstanceId, event].concat(args))
     })
   }
   for (j = 0, len1 = supportedWebViewEvents.length; j < len1; j++) {
@@ -147,12 +147,12 @@ var createGuest = function (embedder, params) {
 
   // Dispatch guest's IPC messages to embedder.
   guest.on('ipc-message-host', function (_, [channel, ...args]) {
-    return embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + guest.viewInstanceId, channel].concat(args))
+    embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + guest.viewInstanceId, channel].concat(args))
   })
 
   // Autosize.
   guest.on('size-changed', function (_, ...args) {
-    return embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + guest.viewInstanceId].concat(args))
+    embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + guest.viewInstanceId].concat(args))
   })
   return id
 }
@@ -206,15 +206,15 @@ var destroyGuest = function (embedder, id) {
 }
 
 ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
-  return event.sender.send('ELECTRON_RESPONSE_' + requestId, createGuest(event.sender, params))
+  event.sender.send('ELECTRON_RESPONSE_' + requestId, createGuest(event.sender, params))
 })
 
 ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
-  return attachGuest(event.sender, elementInstanceId, guestInstanceId, params)
+  attachGuest(event.sender, elementInstanceId, guestInstanceId, params)
 })
 
 ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, id) {
-  return destroyGuest(event.sender, id)
+  destroyGuest(event.sender, id)
 })
 
 ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, id, params) {
diff --git a/lib/browser/guest-window-manager.js b/lib/browser/guest-window-manager.js
index c5189bee60ce..a3d60bee8add 100644
--- a/lib/browser/guest-window-manager.js
+++ b/lib/browser/guest-window-manager.js
@@ -79,7 +79,7 @@ var createGuest = function (embedder, url, frameName, options) {
     frameToGuest[frameName] = guest
     guest.frameName = frameName
     guest.once('closed', function () {
-      return delete frameToGuest[frameName]
+      delete frameToGuest[frameName]
     })
   }
   return guest.id
@@ -98,7 +98,7 @@ ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, fr
 
 ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', function (event, guestId) {
   var ref1
-  return (ref1 = BrowserWindow.fromId(guestId)) != null ? ref1.destroy() : void 0
+  (ref1 = BrowserWindow.fromId(guestId)) != null ? ref1.destroy() : void 0
 })
 
 ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', function (event, guestId, method, ...args) {
@@ -114,11 +114,11 @@ ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', function (event,
   }
   guestContents = (ref2 = BrowserWindow.fromId(guestId)) != null ? ref2.webContents : void 0
   if ((guestContents != null ? guestContents.getURL().indexOf(targetOrigin) : void 0) === 0 || targetOrigin === '*') {
-    return guestContents != null ? guestContents.send('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin) : void 0
+    guestContents != null ? guestContents.send('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin) : void 0
   }
 })
 
 ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', function (event, guestId, method, ...args) {
   var ref1, ref2
-  return (ref1 = BrowserWindow.fromId(guestId)) != null ? (ref2 = ref1.webContents) != null ? ref2[method].apply(ref2, args) : void 0 : void 0
+  (ref1 = BrowserWindow.fromId(guestId)) != null ? (ref2 = ref1.webContents) != null ? ref2[method].apply(ref2, args) : void 0 : void 0
 })
diff --git a/lib/browser/init.js b/lib/browser/init.js
index df670ece7100..924ad1420c2e 100644
--- a/lib/browser/init.js
+++ b/lib/browser/init.js
@@ -61,14 +61,14 @@ process.on('uncaughtException', function (error) {
   dialog = require('electron').dialog
   stack = (ref = error.stack) != null ? ref : error.name + ': ' + error.message
   message = 'Uncaught Exception:\n' + stack
-  return dialog.showErrorBox('A JavaScript error occurred in the main process', message)
+  dialog.showErrorBox('A JavaScript error occurred in the main process', message)
 })
 
 // Emit 'exit' event on quit.
 var app = require('electron').app
 
 app.on('quit', function (event, exitCode) {
-  return process.emit('exit', exitCode)
+  process.emit('exit', exitCode)
 })
 
 if (process.platform === 'win32') {
diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index b4512bfacce6..8fdb77a6cdca 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -273,7 +273,7 @@ ipcMain.on('ELECTRON_BROWSER_FUNCTION_CALL', function (event, id, args) {
   try {
     args = unwrapArgs(event.sender, args)
     let func = objectsRegistry.get(id)
-    return callFunction(event, func, global, args)
+    callFunction(event, func, global, args)
   } catch (error) {
     event.returnValue = exceptionToMeta(error)
   }
@@ -296,7 +296,7 @@ ipcMain.on('ELECTRON_BROWSER_MEMBER_CALL', function (event, id, method, args) {
   try {
     args = unwrapArgs(event.sender, args)
     let obj = objectsRegistry.get(id)
-    return callFunction(event, obj[method], obj, args)
+    callFunction(event, obj[method], obj, args)
   } catch (error) {
     event.returnValue = exceptionToMeta(error)
   }
@@ -322,7 +322,7 @@ ipcMain.on('ELECTRON_BROWSER_MEMBER_GET', function (event, id, name) {
 })
 
 ipcMain.on('ELECTRON_BROWSER_DEREFERENCE', function (event, id) {
-  return objectsRegistry.remove(event.sender.getId(), id)
+  objectsRegistry.remove(event.sender.getId(), id)
 })
 
 ipcMain.on('ELECTRON_BROWSER_GUEST_WEB_CONTENTS', function (event, guestInstanceId) {
diff --git a/lib/common/api/deprecate.js b/lib/common/api/deprecate.js
index ff34a2bdfe78..c146e03e6a80 100644
--- a/lib/common/api/deprecate.js
+++ b/lib/common/api/deprecate.js
@@ -59,8 +59,7 @@ deprecate.property = function (object, property, method) {
 
 // Deprecate an event.
 deprecate.event = function (emitter, oldName, newName, fn) {
-  var warned
-  warned = false
+  var warned = false
   return emitter.on(newName, function (...args) {
     // there is listeners for old API.
     if (this.listenerCount(oldName) > 0) {
@@ -69,9 +68,9 @@ deprecate.event = function (emitter, oldName, newName, fn) {
         deprecate.warn("'" + oldName + "' event", "'" + newName + "' event")
       }
       if (fn != null) {
-        return fn.apply(this, arguments)
+        fn.apply(this, arguments)
       } else {
-        return this.emit.apply(this, [oldName].concat(args))
+        this.emit.apply(this, [oldName].concat(args))
       }
     }
   })
diff --git a/lib/renderer/api/desktop-capturer.js b/lib/renderer/api/desktop-capturer.js
index 32f78f7a6a37..e998c786a593 100644
--- a/lib/renderer/api/desktop-capturer.js
+++ b/lib/renderer/api/desktop-capturer.js
@@ -30,7 +30,7 @@ exports.getSources = function (options, callback) {
   ipcRenderer.send('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', captureWindow, captureScreen, options.thumbnailSize, id)
   return ipcRenderer.once('ELECTRON_RENDERER_DESKTOP_CAPTURER_RESULT_' + id, function (event, sources) {
     var source
-    return callback(null, (function () {
+    callback(null, (function () {
       var i, len, results
       results = []
       for (i = 0, len = sources.length; i < len; i++) {
diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index 617a1fe81a22..b6a0859a9c1d 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -238,12 +238,12 @@ var metaToPlainObject = function (meta) {
 
 // Browser calls a callback in renderer.
 ipcRenderer.on('ELECTRON_RENDERER_CALLBACK', function (event, id, args) {
-  return callbacksRegistry.apply(id, metaToValue(args))
+  callbacksRegistry.apply(id, metaToValue(args))
 })
 
 // A callback in browser is released.
 ipcRenderer.on('ELECTRON_RENDERER_RELEASE_CALLBACK', function (event, id) {
-  return callbacksRegistry.remove(id)
+  callbacksRegistry.remove(id)
 })
 
 // List all built-in modules in browser process.
diff --git a/lib/renderer/inspector.js b/lib/renderer/inspector.js
index df151cf1b5e6..ca60c84d4be9 100644
--- a/lib/renderer/inspector.js
+++ b/lib/renderer/inspector.js
@@ -3,7 +3,7 @@ window.onload = function () {
   window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
 
   // Use dialog API to override file chooser dialog.
-  return (window.WebInspector.createFileSelectorElement = createFileSelectorElement)
+  window.WebInspector.createFileSelectorElement = createFileSelectorElement
 }
 
 var convertToMenuTemplate = function (items) {
diff --git a/lib/renderer/override.js b/lib/renderer/override.js
index bb09a9981dce..8d47573b2fea 100644
--- a/lib/renderer/override.js
+++ b/lib/renderer/override.js
@@ -193,7 +193,7 @@ ipcRenderer.on('ELECTRON_GUEST_WINDOW_POSTMESSAGE', function (event, sourceId, m
   event.data = message
   event.origin = sourceOrigin
   event.source = BrowserWindowProxy.getOrCreate(sourceId)
-  return window.dispatchEvent(event)
+  window.dispatchEvent(event)
 })
 
 // Forward history operations to browser.
diff --git a/lib/renderer/web-view/guest-view-internal.js b/lib/renderer/web-view/guest-view-internal.js
index 4f920707d1be..7432444c6da6 100644
--- a/lib/renderer/web-view/guest-view-internal.js
+++ b/lib/renderer/web-view/guest-view-internal.js
@@ -62,14 +62,14 @@ var dispatchEvent = function (webView, eventName, eventKey, ...args) {
 module.exports = {
   registerEvents: function (webView, viewInstanceId) {
     ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + viewInstanceId, function (event, eventName, ...args) {
-      return dispatchEvent.apply(null, [webView, eventName, eventName].concat(args))
+      dispatchEvent.apply(null, [webView, eventName, eventName].concat(args))
     })
 
     ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + viewInstanceId, function (event, channel, ...args) {
       var domEvent = new Event('ipc-message')
       domEvent.channel = channel
       domEvent.args = args
-      return webView.dispatchEvent(domEvent)
+      webView.dispatchEvent(domEvent)
     })
 
     return ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + viewInstanceId, function (event, ...args) {
@@ -80,7 +80,7 @@ module.exports = {
         f = ref1[i]
         domEvent[f] = args[i]
       }
-      return webView.onSizeChanged(domEvent)
+      webView.onSizeChanged(domEvent)
     })
   },
   deregisterEvents: function (viewInstanceId) {

From d5f3e5d59a04dea87b76e1c6fe75bc5d14bce8b3 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 09:30:24 +0900
Subject: [PATCH 290/510] Bump v1.1.1

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 2 +-
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 601eb2566f1f..fbeac2a7f5e8 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.1.0</string>
+  <string>1.1.1</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.0</string>
+  <string>1.1.1</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 2339dd7844a5..7b0ce5d4a67c 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,1,1,0
+ PRODUCTVERSION 1,1,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.1.0"
+            VALUE "FileVersion", "1.1.1"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.1.0"
+            VALUE "ProductVersion", "1.1.1"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 8e58486091b3..910e69059833 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 1
-#define ATOM_PATCH_VERSION 0
+#define ATOM_PATCH_VERSION 1
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index 2abf7ce58147..be6104531827 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.1.0',
+    'version%': '1.1.1',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index 1db82777b6d1..2bb700e99cd5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From 7c34d8333c5bd2b15b24df831e5064516335896d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 11:31:02 +0900
Subject: [PATCH 291/510] Store ico image in HCION

---
 atom/common/api/atom_api_native_image.cc | 41 ++++++++++++++++--------
 atom/common/api/atom_api_native_image.h  | 11 +++++++
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 97cc674a3115..1bbb9d9950ac 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -142,7 +142,7 @@ bool IsTemplateFilename(const base::FilePath& path) {
 #endif
 
 #if defined(OS_WIN)
-bool ReadImageSkiaFromICO(gfx::ImageSkia* image, const base::FilePath& path) {
+base::win::ScopedHICON ReadICOFromPath(const base::FilePath& path) {
   // If file is in asar archive, we extract it to a temp file so LoadImage can
   // load it.
   base::FilePath asar_path, relative_path;
@@ -155,14 +155,14 @@ bool ReadImageSkiaFromICO(gfx::ImageSkia* image, const base::FilePath& path) {
   }
 
   // Load the icon from file.
-  base::win::ScopedHICON icon(static_cast<HICON>(
+  return base::win::ScopedHICON(static_cast<HICON>(
       LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON, 0, 0,
                 LR_DEFAULTSIZE | LR_LOADFROMFILE)));
-  if (!icon.get())
-    return false;
+}
 
+bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
   // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
-  scoped_ptr<SkBitmap> bitmap(IconUtil::  CreateSkBitmapFromHICON(icon.get()));
+  scoped_ptr<SkBitmap> bitmap(IconUtil::  CreateSkBitmapFromHICON(icon));
   image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
   return true;
 }
@@ -175,6 +175,18 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
   Init(isolate);
 }
 
+#if defined(OS_WIN)
+NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
+    : hicon_(std::move(hicon)) {
+  if (hicon.get()) {
+    gfx::ImageSkia image_skia;
+    ReadImageSkiaFromICO(&image_skia, hicon.get());
+    image_ = gfx::Image(image_skia);
+  }
+  Init(isolate);
+}
+#endif
+
 NativeImage::~NativeImage() {}
 
 v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
@@ -263,23 +275,24 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
 // static
 mate::Handle<NativeImage> NativeImage::CreateFromPath(
     v8::Isolate* isolate, const base::FilePath& path) {
-  gfx::ImageSkia image_skia;
   base::FilePath image_path = NormalizePath(path);
-
   if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
 #if defined(OS_WIN)
-    ReadImageSkiaFromICO(&image_skia, image_path);
+    base::win::ScopedHICON hicon = ReadICOFromPath(image_path);
+    return mate::CreateHandle(isolate,
+                              new NativeImage(isolate, std::move(hicon)));
 #endif
   } else {
+    gfx::ImageSkia image_skia;
     PopulateImageSkiaRepsFromPath(&image_skia, image_path);
-  }
-  gfx::Image image(image_skia);
-  mate::Handle<NativeImage> handle = Create(isolate, image);
+    gfx::Image image(image_skia);
+    mate::Handle<NativeImage> handle = Create(isolate, image);
 #if defined(OS_MACOSX)
-  if (IsTemplateFilename(image_path))
-    handle->SetTemplateImage(true);
+    if (IsTemplateFilename(image_path))
+      handle->SetTemplateImage(true);
 #endif
-  return handle;
+    return handle;
+  }
 }
 
 // static
diff --git a/atom/common/api/atom_api_native_image.h b/atom/common/api/atom_api_native_image.h
index 79844604706c..981f3b8092bc 100644
--- a/atom/common/api/atom_api_native_image.h
+++ b/atom/common/api/atom_api_native_image.h
@@ -11,6 +11,10 @@
 #include "native_mate/wrappable.h"
 #include "ui/gfx/image/image.h"
 
+#if defined(OS_WIN)
+#include "base/win/scoped_gdi_object.h"
+#endif
+
 class GURL;
 
 namespace base {
@@ -52,6 +56,9 @@ class NativeImage : public mate::Wrappable<NativeImage> {
 
  protected:
   NativeImage(v8::Isolate* isolate, const gfx::Image& image);
+#if defined(OS_WIN)
+  NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon);
+#endif
   ~NativeImage() override;
 
  private:
@@ -69,6 +76,10 @@ class NativeImage : public mate::Wrappable<NativeImage> {
   // Determine if the image is a template image.
   bool IsTemplateImage();
 
+#if defined(OS_WIN)
+  base::win::ScopedHICON hicon_;
+#endif
+
   gfx::Image image_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeImage);

From 7d93642f42657130fa5a3e2be019da1c2e849eba Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Thu, 19 May 2016 20:19:08 -0700
Subject: [PATCH 292/510] extend setSheetOffset to accept an optional 2nd
 offset

---
 atom/browser/api/atom_api_window.cc | 11 ++++-------
 atom/browser/api/atom_api_window.h  |  3 +--
 atom/browser/native_window.cc       |  6 +-----
 atom/browser/native_window.h        |  3 +--
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 0266d49a85d5..64847154bcc2 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -371,12 +371,10 @@ std::vector<int> Window::GetMaximumSize() {
   return result;
 }
 
-void Window::SetSheetOffset(double offsetY) {
-  window_->SetSheetOffset(offsetY);
-}
-
-void Window::SetSheetOffsets(double offsetX, double offsetY) {
-  window_->SetSheetOffsets(offsetX, offsetY);
+void Window::SetSheetOffset(double offsetY, mate::Arguments* args) {
+  double offsetX = 0.0;
+  args->GetNext(&offsetX);
+  window_->SetSheetOffset(offsetX, offsetY);
 }
 
 void Window::SetResizable(bool resizable) {
@@ -686,7 +684,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setMaximumSize", &Window::SetMaximumSize)
       .SetMethod("getMaximumSize", &Window::GetMaximumSize)
       .SetMethod("setSheetOffset", &Window::SetSheetOffset)
-      .SetMethod("setSheetOffsets", &Window::SetSheetOffsets)
       .SetMethod("setResizable", &Window::SetResizable)
       .SetMethod("isResizable", &Window::IsResizable)
       .SetMethod("setMovable", &Window::SetMovable)
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index 2eef725eaca8..d44f706f7011 100644
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -110,8 +110,7 @@ class Window : public mate::TrackableObject<Window>,
   std::vector<int> GetMinimumSize();
   void SetMaximumSize(int width, int height);
   std::vector<int> GetMaximumSize();
-  void SetSheetOffset(double offsetY);
-  void SetSheetOffsets(double offsetX, double offsetY);
+  void SetSheetOffset(double offsetY, mate::Arguments* args);
   void SetResizable(bool resizable);
   bool IsResizable();
   void SetMovable(bool movable);
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index af874cae483d..39848d8dd094 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -255,11 +255,7 @@ gfx::Size NativeWindow::GetMaximumSize() {
   return GetSizeConstraints().GetMaximumSize();
 }
 
-void NativeWindow::SetSheetOffset(const double offsetY) {
-  sheet_offset_y_ = offsetY;
-}
-
-void NativeWindow::SetSheetOffsets(const double offsetX, const double offsetY) {
+void NativeWindow::SetSheetOffset(const double offsetX, const double offsetY) {
   sheet_offset_x_ = offsetX;
   sheet_offset_y_ = offsetY;
 }
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 813eeb53126d..f4fae05f14b3 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -123,8 +123,7 @@ class NativeWindow : public base::SupportsUserData,
   virtual gfx::Size GetMinimumSize();
   virtual void SetMaximumSize(const gfx::Size& size);
   virtual gfx::Size GetMaximumSize();
-  virtual void SetSheetOffset(const double offsetY);
-  virtual void SetSheetOffsets(const double offsetX, const double offsetY);
+  virtual void SetSheetOffset(const double offsetX, const double offsetY);
   virtual double GetSheetOffsetX();
   virtual double GetSheetOffsetY();
   virtual void SetResizable(bool resizable) = 0;

From 9196a9f3341d786f3920935ee5635292a3fbab3a Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Thu, 19 May 2016 20:26:46 -0700
Subject: [PATCH 293/510] update docs

---
 docs/api/browser-window.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index a00b814a598c..b3100e93344e 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -682,7 +682,7 @@ Returns the title of the native window.
 **Note:** The title of web page can be different from the title of the native
 window.
 
-### `win.setSheetOffset(offsetY)` _OS X_
+### `win.setSheetOffset(offsetY[, offsetX])` _OS X_
 
 Changes the attachment point for sheets on Mac OS X. By default, sheets are
 attached just below the window frame, but you may want to display them beneath
@@ -693,16 +693,6 @@ let toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
 win.setSheetOffset(toolbarRect.height);
 ```
 
-### `win.setSheetOffsets(offsetX, offsetY)` _OS X_
-
-Like `win.setSheetOffset` but allows for an offset along the x-axis to be set
-in addition to the y-axis.
-
-```javascript
-let toolbarRect = document.getElementById('toolbar').getBoundingClientRect();
-win.setSheetOffset(toolbarRect.left, toolbarRect.height);
-```
-
 ### `win.flashFrame(flag)`
 
 * `flag` Boolean

From adfd99f5f08258535d17b3f3867bf9176afc73c4 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 16:14:40 +0900
Subject: [PATCH 294/510] Convert to mate::Handle<NativeImage> instead of
 gfx::Image

---
 atom/browser/api/atom_api_tray.cc             | 30 +++++++++++--------
 atom/browser/api/atom_api_tray.h              | 20 ++++++++-----
 atom/common/api/atom_api_native_image.cc      | 29 ++++++++++++++++++
 atom/common/api/atom_api_native_image.h       | 18 +++++++++++
 .../native_mate_converters/image_converter.cc | 12 ++------
 vendor/native_mate                            |  2 +-
 6 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index 34fe81b92b22..a6d508068a00 100644
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -9,6 +9,7 @@
 #include "atom/browser/api/atom_api_menu.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/ui/tray_icon.h"
+#include "atom/common/api/atom_api_native_image.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
@@ -22,9 +23,10 @@ namespace atom {
 
 namespace api {
 
-Tray::Tray(v8::Isolate* isolate, const gfx::Image& image)
-    : tray_icon_(TrayIcon::Create()) {
-  tray_icon_->SetImage(image);
+Tray::Tray(v8::Isolate* isolate, mate::Handle<NativeImage> image)
+    : image_(isolate, image.ToV8()),
+      tray_icon_(TrayIcon::Create()) {
+  tray_icon_->SetImage(image->image());
   tray_icon_->AddObserver(this);
 }
 
@@ -32,7 +34,8 @@ Tray::~Tray() {
 }
 
 // static
-mate::WrappableBase* Tray::New(v8::Isolate* isolate, const gfx::Image& image) {
+mate::WrappableBase* Tray::New(v8::Isolate* isolate,
+                               mate::Handle<NativeImage> image) {
   if (!Browser::Get()->is_ready()) {
     isolate->ThrowException(v8::Exception::Error(mate::StringToV8(
         isolate, "Cannot create Tray before app is ready")));
@@ -94,23 +97,26 @@ void Tray::OnDragEnded() {
   Emit("drag-end");
 }
 
-void Tray::SetImage(mate::Arguments* args, const gfx::Image& image) {
-  tray_icon_->SetImage(image);
+void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
+  image_.Reset(isolate, image.ToV8());
+  tray_icon_->SetImage(image->image());
 }
 
-void Tray::SetPressedImage(mate::Arguments* args, const gfx::Image& image) {
-  tray_icon_->SetPressedImage(image);
+void Tray::SetPressedImage(v8::Isolate* isolate,
+                           mate::Handle<NativeImage> image) {
+  pressed_image_.Reset(isolate, image.ToV8());
+  tray_icon_->SetPressedImage(image->image());
 }
 
-void Tray::SetToolTip(mate::Arguments* args, const std::string& tool_tip) {
+void Tray::SetToolTip(const std::string& tool_tip) {
   tray_icon_->SetToolTip(tool_tip);
 }
 
-void Tray::SetTitle(mate::Arguments* args, const std::string& title) {
+void Tray::SetTitle(const std::string& title) {
   tray_icon_->SetTitle(title);
 }
 
-void Tray::SetHighlightMode(mate::Arguments* args, bool highlight) {
+void Tray::SetHighlightMode(bool highlight) {
   tray_icon_->SetHighlightMode(highlight);
 }
 
@@ -136,7 +142,7 @@ void Tray::PopUpContextMenu(mate::Arguments* args) {
   tray_icon_->PopUpContextMenu(pos, menu.IsEmpty() ? nullptr : menu->model());
 }
 
-void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) {
+void Tray::SetContextMenu(Menu* menu) {
   tray_icon_->SetContextMenu(menu->model());
 }
 
diff --git a/atom/browser/api/atom_api_tray.h b/atom/browser/api/atom_api_tray.h
index 84e68220dba8..2a794b5dcc73 100644
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -11,6 +11,7 @@
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/ui/tray_icon_observer.h"
 #include "base/memory/scoped_ptr.h"
+#include "native_mate/handle.h"
 
 namespace gfx {
 class Image;
@@ -28,18 +29,19 @@ class TrayIcon;
 namespace api {
 
 class Menu;
+class NativeImage;
 
 class Tray : public mate::TrackableObject<Tray>,
              public TrayIconObserver {
  public:
   static mate::WrappableBase* New(
-      v8::Isolate* isolate, const gfx::Image& image);
+      v8::Isolate* isolate, mate::Handle<NativeImage> image);
 
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::ObjectTemplate> prototype);
 
  protected:
-  Tray(v8::Isolate* isolate, const gfx::Image& image);
+  Tray(v8::Isolate* isolate, mate::Handle<NativeImage> image);
   ~Tray() override;
 
   // TrayIconObserver:
@@ -55,18 +57,20 @@ class Tray : public mate::TrackableObject<Tray>,
   void OnDragExited() override;
   void OnDragEnded() override;
 
-  void SetImage(mate::Arguments* args, const gfx::Image& image);
-  void SetPressedImage(mate::Arguments* args, const gfx::Image& image);
-  void SetToolTip(mate::Arguments* args, const std::string& tool_tip);
-  void SetTitle(mate::Arguments* args, const std::string& title);
-  void SetHighlightMode(mate::Arguments* args, bool highlight);
+  void SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
+  void SetPressedImage(v8::Isolate* isolate, mate::Handle<NativeImage> image);
+  void SetToolTip(const std::string& tool_tip);
+  void SetTitle(const std::string& title);
+  void SetHighlightMode(bool highlight);
   void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
   void PopUpContextMenu(mate::Arguments* args);
-  void SetContextMenu(mate::Arguments* args, Menu* menu);
+  void SetContextMenu(Menu* menu);
 
  private:
   v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
 
+  v8::Global<v8::Object> image_;
+  v8::Global<v8::Object> pressed_image_;
   scoped_ptr<TrayIcon> tray_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(Tray);
diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 1bbb9d9950ac..1b1b7ac65c46 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -341,6 +341,35 @@ void NativeImage::BuildPrototype(
 
 }  // namespace atom
 
+namespace mate {
+
+v8::Local<v8::Value> Converter<mate::Handle<atom::api::NativeImage>>::ToV8(
+    v8::Isolate* isolate,
+    const mate::Handle<atom::api::NativeImage>& val) {
+  return val.ToV8();
+}
+
+bool Converter<mate::Handle<atom::api::NativeImage>>::FromV8(
+    v8::Isolate* isolate, v8::Local<v8::Value> val,
+    mate::Handle<atom::api::NativeImage>* out) {
+  // Try converting from file path.
+  base::FilePath path;
+  if (ConvertFromV8(isolate, val, &path)) {
+    *out = atom::api::NativeImage::CreateFromPath(isolate, path);
+    // Should throw when failed to initialize from path.
+    return !(*out)->image().IsEmpty();
+  }
+
+  WrappableBase* wrapper = static_cast<WrappableBase*>(internal::FromV8Impl(
+      isolate, val));
+  if (!wrapper)
+    return false;
+
+  *out = CreateHandle(isolate, static_cast<atom::api::NativeImage*>(wrapper));
+  return true;
+}
+
+}  // namespace mate
 
 namespace {
 
diff --git a/atom/common/api/atom_api_native_image.h b/atom/common/api/atom_api_native_image.h
index 981f3b8092bc..faf00f372bcf 100644
--- a/atom/common/api/atom_api_native_image.h
+++ b/atom/common/api/atom_api_native_image.h
@@ -53,6 +53,9 @@ class NativeImage : public mate::Wrappable<NativeImage> {
                              v8::Local<v8::ObjectTemplate> prototype);
 
   const gfx::Image& image() const { return image_; }
+#if defined(OS_WIN)
+  HICON hicon() const { return hicon_.get(); }
+#endif
 
  protected:
   NativeImage(v8::Isolate* isolate, const gfx::Image& image);
@@ -89,4 +92,19 @@ class NativeImage : public mate::Wrappable<NativeImage> {
 
 }  // namespace atom
 
+namespace mate {
+
+// A custom converter that allows converting path to NativeImage.
+template<>
+struct Converter<mate::Handle<atom::api::NativeImage>> {
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate,
+      const mate::Handle<atom::api::NativeImage>& val);
+  static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
+                     mate::Handle<atom::api::NativeImage>* out);
+};
+
+}  // namespace mate
+
+
 #endif  // ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
diff --git a/atom/common/native_mate_converters/image_converter.cc b/atom/common/native_mate_converters/image_converter.cc
index 550bb7b904a7..cfb1938a138f 100644
--- a/atom/common/native_mate_converters/image_converter.cc
+++ b/atom/common/native_mate_converters/image_converter.cc
@@ -28,16 +28,8 @@ bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
     return true;
 
   Handle<atom::api::NativeImage> native_image;
-  if (!ConvertFromV8(isolate, val, &native_image)) {
-    // Try converting from file path.
-    base::FilePath path;
-    if (!Converter<base::FilePath>::FromV8(isolate, val, &path))
-      return false;
-
-    native_image = atom::api::NativeImage::CreateFromPath(isolate, path);
-    if (native_image->image().IsEmpty())
-      return false;
-  }
+  if (!ConvertFromV8(isolate, val, &native_image))
+    return false;
 
   *out = native_image->image();
   return true;
diff --git a/vendor/native_mate b/vendor/native_mate
index ea07d4c6c89d..4ad6ecd19617 160000
--- a/vendor/native_mate
+++ b/vendor/native_mate
@@ -1 +1 @@
-Subproject commit ea07d4c6c89d8d460e76b2d2ab9b0ebc51f9a432
+Subproject commit 4ad6ecd19617ac33c09e93ccb6d8e652ac1ac126

From 67d9ae27c36eafbd616ce5cb6e0e60ec1095a558 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 16:18:38 +0900
Subject: [PATCH 295/510] Remove the JavaScript wrapper for setContextMenu

---
 atom/browser/api/atom_api_tray.cc | 5 +++--
 atom/browser/api/atom_api_tray.h  | 3 ++-
 lib/browser/api/tray.js           | 7 -------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index a6d508068a00..973bc83dcf8e 100644
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -142,7 +142,8 @@ void Tray::PopUpContextMenu(mate::Arguments* args) {
   tray_icon_->PopUpContextMenu(pos, menu.IsEmpty() ? nullptr : menu->model());
 }
 
-void Tray::SetContextMenu(Menu* menu) {
+void Tray::SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu) {
+  menu_.Reset(isolate, menu.ToV8());
   tray_icon_->SetContextMenu(menu->model());
 }
 
@@ -168,7 +169,7 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setHighlightMode", &Tray::SetHighlightMode)
       .SetMethod("displayBalloon", &Tray::DisplayBalloon)
       .SetMethod("popUpContextMenu", &Tray::PopUpContextMenu)
-      .SetMethod("_setContextMenu", &Tray::SetContextMenu);
+      .SetMethod("setContextMenu", &Tray::SetContextMenu);
 }
 
 }  // namespace api
diff --git a/atom/browser/api/atom_api_tray.h b/atom/browser/api/atom_api_tray.h
index 2a794b5dcc73..312185aed408 100644
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -64,13 +64,14 @@ class Tray : public mate::TrackableObject<Tray>,
   void SetHighlightMode(bool highlight);
   void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
   void PopUpContextMenu(mate::Arguments* args);
-  void SetContextMenu(Menu* menu);
+  void SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu);
 
  private:
   v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
 
   v8::Global<v8::Object> image_;
   v8::Global<v8::Object> pressed_image_;
+  v8::Global<v8::Object> menu_;
   scoped_ptr<TrayIcon> tray_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(Tray);
diff --git a/lib/browser/api/tray.js b/lib/browser/api/tray.js
index 2afdb3643146..bc0a9d26f655 100644
--- a/lib/browser/api/tray.js
+++ b/lib/browser/api/tray.js
@@ -3,11 +3,4 @@ const {Tray} = process.atomBinding('tray')
 
 Object.setPrototypeOf(Tray.prototype, EventEmitter.prototype)
 
-Tray.prototype.setContextMenu = function (menu) {
-  this._setContextMenu(menu)
-
-  // Keep a strong reference of menu.
-  this.menu = menu
-}
-
 module.exports = Tray

From 9e26e5c1210e97b5a83d3c1be219cf09cf839f39 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 16:55:22 +0900
Subject: [PATCH 296/510] Load HICON directly in NotifyIcon

---
 atom/browser/api/atom_api_tray.cc        | 22 ++++++++++++++++++++--
 atom/browser/ui/tray_icon.cc             |  4 ++--
 atom/browser/ui/tray_icon.h              | 12 +++++++++---
 atom/browser/ui/win/notify_icon.cc       | 23 +++++++++--------------
 atom/browser/ui/win/notify_icon.h        | 12 ++++--------
 atom/common/api/atom_api_native_image.cc | 20 +++++++++++++++-----
 atom/common/api/atom_api_native_image.h  |  5 +++--
 7 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index 973bc83dcf8e..edfc1d13fef1 100644
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -26,7 +26,11 @@ namespace api {
 Tray::Tray(v8::Isolate* isolate, mate::Handle<NativeImage> image)
     : image_(isolate, image.ToV8()),
       tray_icon_(TrayIcon::Create()) {
+#if defined(OS_WIN)
+  tray_icon_->SetImage(image->GetHICON());
+#else
   tray_icon_->SetImage(image->image());
+#endif
   tray_icon_->AddObserver(this);
 }
 
@@ -99,13 +103,21 @@ void Tray::OnDragEnded() {
 
 void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
   image_.Reset(isolate, image.ToV8());
+#if defined(OS_WIN)
+  tray_icon_->SetImage(image->GetHICON());
+#else
   tray_icon_->SetImage(image->image());
+#endif
 }
 
 void Tray::SetPressedImage(v8::Isolate* isolate,
                            mate::Handle<NativeImage> image) {
   pressed_image_.Reset(isolate, image.ToV8());
+#if defined(OS_WIN)
+  tray_icon_->SetPressedImage(image->GetHICON());
+#else
   tray_icon_->SetPressedImage(image->image());
+#endif
 }
 
 void Tray::SetToolTip(const std::string& tool_tip) {
@@ -122,7 +134,7 @@ void Tray::SetHighlightMode(bool highlight) {
 
 void Tray::DisplayBalloon(mate::Arguments* args,
                           const mate::Dictionary& options) {
-  gfx::Image icon;
+  mate::Handle<NativeImage> icon;
   options.Get("icon", &icon);
   base::string16 title, content;
   if (!options.Get("title", &title) ||
@@ -131,7 +143,13 @@ void Tray::DisplayBalloon(mate::Arguments* args,
     return;
   }
 
-  tray_icon_->DisplayBalloon(icon, title, content);
+#if defined(OS_WIN)
+  tray_icon_->DisplayBalloon(
+      icon.IsEmpty() ? NULL : icon->GetHICON(), title, content);
+#else
+  tray_icon_->DisplayBalloon(
+      icon.IsEmpty() ? gfx::Image() : icon->image(), title, content);
+#endif
 }
 
 void Tray::PopUpContextMenu(mate::Arguments* args) {
diff --git a/atom/browser/ui/tray_icon.cc b/atom/browser/ui/tray_icon.cc
index 60923c2ad0a6..dcdb90ac159c 100644
--- a/atom/browser/ui/tray_icon.cc
+++ b/atom/browser/ui/tray_icon.cc
@@ -12,7 +12,7 @@ TrayIcon::TrayIcon() {
 TrayIcon::~TrayIcon() {
 }
 
-void TrayIcon::SetPressedImage(const gfx::Image& image) {
+void TrayIcon::SetPressedImage(ImageType image) {
 }
 
 void TrayIcon::SetTitle(const std::string& title) {
@@ -21,7 +21,7 @@ void TrayIcon::SetTitle(const std::string& title) {
 void TrayIcon::SetHighlightMode(bool highlight) {
 }
 
-void TrayIcon::DisplayBalloon(const gfx::Image& icon,
+void TrayIcon::DisplayBalloon(ImageType icon,
                               const base::string16& title,
                               const base::string16& contents) {
 }
diff --git a/atom/browser/ui/tray_icon.h b/atom/browser/ui/tray_icon.h
index c80ff08d6a52..dd018821cd3a 100644
--- a/atom/browser/ui/tray_icon.h
+++ b/atom/browser/ui/tray_icon.h
@@ -19,13 +19,19 @@ class TrayIcon {
  public:
   static TrayIcon* Create();
 
+#if defined(OS_WIN)
+  using ImageType = HICON;
+#else
+  using ImageType = const gfx::Image&;
+#endif
+
   virtual ~TrayIcon();
 
   // Sets the image associated with this status icon.
-  virtual void SetImage(const gfx::Image& image) = 0;
+  virtual void SetImage(ImageType image) = 0;
 
   // Sets the image associated with this status icon when pressed.
-  virtual void SetPressedImage(const gfx::Image& image);
+  virtual void SetPressedImage(ImageType image);
 
   // Sets the hover text for this status icon. This is also used as the label
   // for the menu item which is created as a replacement for the status icon
@@ -43,7 +49,7 @@ class TrayIcon {
 
   // Displays a notification balloon with the specified contents.
   // Depending on the platform it might not appear by the icon tray.
-  virtual void DisplayBalloon(const gfx::Image& icon,
+  virtual void DisplayBalloon(ImageType icon,
                               const base::string16& title,
                               const base::string16& contents);
 
diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index 464dc144ba3e..98c967e5c8fc 100644
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -9,7 +9,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
@@ -26,6 +25,7 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
       icon_id_(id),
       window_(window),
       message_id_(message),
+      icon_(NULL),
       menu_model_(NULL) {
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
@@ -80,7 +80,7 @@ void NotifyIcon::ResetIcon() {
   InitIconData(&icon_data);
   icon_data.uFlags |= NIF_MESSAGE;
   icon_data.uCallbackMessage = message_id_;
-  icon_data.hIcon = icon_.get();
+  icon_data.hIcon = icon_;
   // If we have an image, then set the NIF_ICON flag, which tells
   // Shell_NotifyIcon() to set the image for the status icon it creates.
   if (icon_data.hIcon)
@@ -91,19 +91,19 @@ void NotifyIcon::ResetIcon() {
     LOG(WARNING) << "Unable to re-create status tray icon.";
 }
 
-void NotifyIcon::SetImage(const gfx::Image& image) {
+void NotifyIcon::SetImage(HICON image) {
   // Create the icon.
+  icon_ = image;
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags |= NIF_ICON;
-  icon_ = IconUtil::CreateHICONFromSkBitmap(image.AsBitmap());
-  icon_data.hIcon = icon_.get();
+  icon_data.hIcon = image;
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
     LOG(WARNING) << "Error setting status tray icon image";
 }
 
-void NotifyIcon::SetPressedImage(const gfx::Image& image) {
+void NotifyIcon::SetPressedImage(HICON image) {
   // Ignore pressed images, since the standard on Windows is to not highlight
   // pressed status icons.
 }
@@ -119,7 +119,7 @@ void NotifyIcon::SetToolTip(const std::string& tool_tip) {
     LOG(WARNING) << "Unable to set tooltip for status tray icon";
 }
 
-void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
+void NotifyIcon::DisplayBalloon(HICON icon,
                                 const base::string16& title,
                                 const base::string16& contents) {
   NOTIFYICONDATA icon_data;
@@ -129,13 +129,8 @@ void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
   wcsncpy_s(icon_data.szInfoTitle, title.c_str(), _TRUNCATE);
   wcsncpy_s(icon_data.szInfo, contents.c_str(), _TRUNCATE);
   icon_data.uTimeout = 0;
-
-  base::win::Version win_version = base::win::GetVersion();
-  if (!icon.IsEmpty() && win_version != base::win::VERSION_PRE_XP) {
-    balloon_icon_ = IconUtil::CreateHICONFromSkBitmap(icon.AsBitmap());
-    icon_data.hBalloonIcon = balloon_icon_.get();
-    icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
-  }
+  icon_data.hBalloonIcon = icon;
+  icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
 
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
diff --git a/atom/browser/ui/win/notify_icon.h b/atom/browser/ui/win/notify_icon.h
index 53ed49b937c1..1c6f240a0cea 100644
--- a/atom/browser/ui/win/notify_icon.h
+++ b/atom/browser/ui/win/notify_icon.h
@@ -14,7 +14,6 @@
 #include "base/macros.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/win/scoped_gdi_object.h"
 
 namespace gfx {
 class Point;
@@ -45,10 +44,10 @@ class NotifyIcon : public TrayIcon {
   UINT message_id() const { return message_id_; }
 
   // Overridden from TrayIcon:
-  void SetImage(const gfx::Image& image) override;
-  void SetPressedImage(const gfx::Image& image) override;
+  void SetImage(HICON image) override;
+  void SetPressedImage(HICON image) override;
   void SetToolTip(const std::string& tool_tip) override;
-  void DisplayBalloon(const gfx::Image& icon,
+  void DisplayBalloon(HICON icon,
                       const base::string16& title,
                       const base::string16& contents) override;
   void PopUpContextMenu(const gfx::Point& pos,
@@ -71,10 +70,7 @@ class NotifyIcon : public TrayIcon {
   UINT message_id_;
 
   // The currently-displayed icon for the window.
-  base::win::ScopedHICON icon_;
-
-  // The currently-displayed icon for the notification balloon.
-  base::win::ScopedHICON balloon_icon_;
+  HICON icon_;
 
   // The context menu.
   ui::SimpleMenuModel* menu_model_;
diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 1b1b7ac65c46..92fba4b89b0f 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -160,11 +160,10 @@ base::win::ScopedHICON ReadICOFromPath(const base::FilePath& path) {
                 LR_DEFAULTSIZE | LR_LOADFROMFILE)));
 }
 
-bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
+void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
   // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
-  scoped_ptr<SkBitmap> bitmap(IconUtil::  CreateSkBitmapFromHICON(icon));
+  scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
   image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
-  return true;
 }
 #endif
 
@@ -178,9 +177,9 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
 #if defined(OS_WIN)
 NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
     : hicon_(std::move(hicon)) {
-  if (hicon.get()) {
+  if (hicon_.get()) {
     gfx::ImageSkia image_skia;
-    ReadImageSkiaFromICO(&image_skia, hicon.get());
+    ReadImageSkiaFromICO(&image_skia, hicon_.get());
     image_ = gfx::Image(image_skia);
   }
   Init(isolate);
@@ -189,6 +188,17 @@ NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
 
 NativeImage::~NativeImage() {}
 
+#if defined(OS_WIN)
+HICON NativeImage::GetHICON() {
+  if (hicon_.get())
+    return hicon_.get();
+  if (image_.IsEmpty())
+    return NULL;
+  hicon_ = std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
+  return hicon_.get();
+}
+#endif
+
 v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
   scoped_refptr<base::RefCountedMemory> png = image_.As1xPNGBytes();
   return node::Buffer::Copy(isolate,
diff --git a/atom/common/api/atom_api_native_image.h b/atom/common/api/atom_api_native_image.h
index faf00f372bcf..f79654d39e72 100644
--- a/atom/common/api/atom_api_native_image.h
+++ b/atom/common/api/atom_api_native_image.h
@@ -52,11 +52,12 @@ class NativeImage : public mate::Wrappable<NativeImage> {
   static void BuildPrototype(v8::Isolate* isolate,
                              v8::Local<v8::ObjectTemplate> prototype);
 
-  const gfx::Image& image() const { return image_; }
 #if defined(OS_WIN)
-  HICON hicon() const { return hicon_.get(); }
+  HICON GetHICON();
 #endif
 
+  const gfx::Image& image() const { return image_; }
+
  protected:
   NativeImage(v8::Isolate* isolate, const gfx::Image& image);
 #if defined(OS_WIN)

From 0059e7bcf9a946cf7f1017a97e5e50001313777b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 17:12:07 +0900
Subject: [PATCH 297/510] Use LoadIconMetric to load correct icon

---
 atom/common/api/atom_api_native_image.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 92fba4b89b0f..5f15bad831bd 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -4,6 +4,10 @@
 
 #include "atom/common/api/atom_api_native_image.h"
 
+#if defined(OS_WIN)
+#include <commctrl.h>
+#endif
+
 #include <string>
 #include <vector>
 
@@ -155,9 +159,9 @@ base::win::ScopedHICON ReadICOFromPath(const base::FilePath& path) {
   }
 
   // Load the icon from file.
-  return base::win::ScopedHICON(static_cast<HICON>(
-      LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON, 0, 0,
-                LR_DEFAULTSIZE | LR_LOADFROMFILE)));
+  HICON icon = NULL;
+  LoadIconMetric(NULL, image_path.value().c_str(), LIM_SMALL, &icon);
+  return base::win::ScopedHICON(icon);
 }
 
 void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {

From ea2807c89054c83d527d128e838620c40a53e568 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 17:51:05 +0900
Subject: [PATCH 298/510] Make it possible to get different size of icons from
 ICO

---
 atom/browser/api/atom_api_tray.cc        | 16 +++-----
 atom/common/api/atom_api_native_image.cc | 48 +++++++++++++-----------
 atom/common/api/atom_api_native_image.h  |  9 +++--
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index edfc1d13fef1..5de3b63a4ce7 100644
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -24,13 +24,8 @@ namespace atom {
 namespace api {
 
 Tray::Tray(v8::Isolate* isolate, mate::Handle<NativeImage> image)
-    : image_(isolate, image.ToV8()),
-      tray_icon_(TrayIcon::Create()) {
-#if defined(OS_WIN)
-  tray_icon_->SetImage(image->GetHICON());
-#else
-  tray_icon_->SetImage(image->image());
-#endif
+    : tray_icon_(TrayIcon::Create()) {
+  SetImage(isolate, image);
   tray_icon_->AddObserver(this);
 }
 
@@ -104,7 +99,7 @@ void Tray::OnDragEnded() {
 void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
   image_.Reset(isolate, image.ToV8());
 #if defined(OS_WIN)
-  tray_icon_->SetImage(image->GetHICON());
+  tray_icon_->SetImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
 #else
   tray_icon_->SetImage(image->image());
 #endif
@@ -114,7 +109,7 @@ void Tray::SetPressedImage(v8::Isolate* isolate,
                            mate::Handle<NativeImage> image) {
   pressed_image_.Reset(isolate, image.ToV8());
 #if defined(OS_WIN)
-  tray_icon_->SetPressedImage(image->GetHICON());
+  tray_icon_->SetPressedImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
 #else
   tray_icon_->SetPressedImage(image->image());
 #endif
@@ -145,7 +140,8 @@ void Tray::DisplayBalloon(mate::Arguments* args,
 
 #if defined(OS_WIN)
   tray_icon_->DisplayBalloon(
-      icon.IsEmpty() ? NULL : icon->GetHICON(), title, content);
+      icon.IsEmpty() ? NULL : icon->GetHICON(GetSystemMetrics(SM_CXSMICON)),
+      title, content);
 #else
   tray_icon_->DisplayBalloon(
       icon.IsEmpty() ? gfx::Image() : icon->image(), title, content);
diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 5f15bad831bd..970f22cc68a5 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -4,10 +4,6 @@
 
 #include "atom/common/api/atom_api_native_image.h"
 
-#if defined(OS_WIN)
-#include <commctrl.h>
-#endif
-
 #include <string>
 #include <vector>
 
@@ -146,7 +142,7 @@ bool IsTemplateFilename(const base::FilePath& path) {
 #endif
 
 #if defined(OS_WIN)
-base::win::ScopedHICON ReadICOFromPath(const base::FilePath& path) {
+base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
   // If file is in asar archive, we extract it to a temp file so LoadImage can
   // load it.
   base::FilePath asar_path, relative_path;
@@ -159,9 +155,9 @@ base::win::ScopedHICON ReadICOFromPath(const base::FilePath& path) {
   }
 
   // Load the icon from file.
-  HICON icon = NULL;
-  LoadIconMetric(NULL, image_path.value().c_str(), LIM_SMALL, &icon);
-  return base::win::ScopedHICON(icon);
+  return base::win::ScopedHICON(static_cast<HICON>(
+      LoadImage(NULL, image_path.value().c_str(), IMAGE_ICON, size, size,
+                LR_LOADFROMFILE)));
 }
 
 void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
@@ -179,13 +175,12 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
 }
 
 #if defined(OS_WIN)
-NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
-    : hicon_(std::move(hicon)) {
-  if (hicon_.get()) {
-    gfx::ImageSkia image_skia;
-    ReadImageSkiaFromICO(&image_skia, hicon_.get());
-    image_ = gfx::Image(image_skia);
-  }
+NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
+    : hicon_path_(hicon_path) {
+  // Use the 256x256 icon as fallback icon.
+  gfx::ImageSkia image_skia;
+  ReadImageSkiaFromICO(&image_skia, GetHICON(256));
+  image_ = gfx::Image(image_skia);
   Init(isolate);
 }
 #endif
@@ -193,13 +188,23 @@ NativeImage::NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon)
 NativeImage::~NativeImage() {}
 
 #if defined(OS_WIN)
-HICON NativeImage::GetHICON() {
-  if (hicon_.get())
-    return hicon_.get();
+HICON NativeImage::GetHICON(int size) {
+  auto iter = hicons_.find(size);
+  if (iter != hicons_.end())
+    return iter->second.get();
+
+  // First try loading the icon with specified size.
+  if (!hicon_path_.empty()) {
+    hicons_[size] = std::move(ReadICOFromPath(size, hicon_path_));
+    return hicons_[size].get();
+  }
+
+  // Then convert the image to ICO.
   if (image_.IsEmpty())
     return NULL;
-  hicon_ = std::move(IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
-  return hicon_.get();
+  hicons_[size] = std::move(
+      IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap()));
+  return hicons_[size].get();
 }
 #endif
 
@@ -292,9 +297,8 @@ mate::Handle<NativeImage> NativeImage::CreateFromPath(
   base::FilePath image_path = NormalizePath(path);
   if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
 #if defined(OS_WIN)
-    base::win::ScopedHICON hicon = ReadICOFromPath(image_path);
     return mate::CreateHandle(isolate,
-                              new NativeImage(isolate, std::move(hicon)));
+                              new NativeImage(isolate, image_path));
 #endif
   } else {
     gfx::ImageSkia image_skia;
diff --git a/atom/common/api/atom_api_native_image.h b/atom/common/api/atom_api_native_image.h
index f79654d39e72..de4db4c0f382 100644
--- a/atom/common/api/atom_api_native_image.h
+++ b/atom/common/api/atom_api_native_image.h
@@ -5,6 +5,7 @@
 #ifndef ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
 #define ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
 
+#include <map>
 #include <string>
 
 #include "native_mate/handle.h"
@@ -12,6 +13,7 @@
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_WIN)
+#include "base/files/file_path.h"
 #include "base/win/scoped_gdi_object.h"
 #endif
 
@@ -53,7 +55,7 @@ class NativeImage : public mate::Wrappable<NativeImage> {
                              v8::Local<v8::ObjectTemplate> prototype);
 
 #if defined(OS_WIN)
-  HICON GetHICON();
+  HICON GetHICON(int size);
 #endif
 
   const gfx::Image& image() const { return image_; }
@@ -61,7 +63,7 @@ class NativeImage : public mate::Wrappable<NativeImage> {
  protected:
   NativeImage(v8::Isolate* isolate, const gfx::Image& image);
 #if defined(OS_WIN)
-  NativeImage(v8::Isolate* isolate, base::win::ScopedHICON&& hicon);
+  NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path);
 #endif
   ~NativeImage() override;
 
@@ -81,7 +83,8 @@ class NativeImage : public mate::Wrappable<NativeImage> {
   bool IsTemplateImage();
 
 #if defined(OS_WIN)
-  base::win::ScopedHICON hicon_;
+  base::FilePath hicon_path_;
+  std::map<int, base::win::ScopedHICON> hicons_;
 #endif
 
   gfx::Image image_;

From d26480b74e4f11b1cf40e1e2fc9ed8c87d78ff79 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 19:46:05 +0900
Subject: [PATCH 299/510] Correctly set window icon from ICO

---
 atom/browser/api/atom_api_window.cc     | 10 ++++++++++
 atom/browser/native_window.cc           |  3 ---
 atom/browser/native_window.h            |  4 ----
 atom/browser/native_window_views.cc     |  9 +++++++--
 atom/browser/native_window_views.h      | 13 +++++++++----
 atom/browser/native_window_views_win.cc |  8 ++++++++
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 399b4d36d2ec..caefd2720029 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -9,6 +9,7 @@
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/native_window.h"
+#include "atom/common/api/atom_api_native_image.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
@@ -99,6 +100,15 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
   window_->InitFromOptions(options);
   window_->AddObserver(this);
   AttachAsUserData(window_.get());
+
+#if defined(OS_WIN)
+  // Sets the window icon.
+  mate::Handle<NativeImage> icon;
+  if (options.Get(options::kIcon, &icon) && !icon.IsEmpty()) {
+    static_cast<NativeWindowViews*>(window_.get())->SetIcon(
+        icon->GetHICON(GetSystemMetrics(SM_CXSMICON)), icon->GetHICON(256));
+  }
+#endif
 }
 
 Window::~Window() {
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 0d5c26c560d1..f0c0864a519b 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -65,9 +65,6 @@ NativeWindow::NativeWindow(
   // mode.
   ui::GpuSwitchingManager::SetTransparent(transparent_);
 
-  // Read icon before window is created.
-  options.Get(options::kIcon, &icon_);
-
   WindowList::AddWindow(this);
 }
 
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 7317a7ba6f76..6a96c013e79e 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -251,7 +251,6 @@ class NativeWindow : public base::SupportsUserData,
   bool transparent() const { return transparent_; }
   SkRegion* draggable_region() const { return draggable_region_.get(); }
   bool enable_larger_than_screen() const { return enable_larger_than_screen_; }
-  gfx::ImageSkia icon() const { return icon_; }
 
   void set_has_dialog_attached(bool has_dialog_attached) {
     has_dialog_attached_ = has_dialog_attached;
@@ -307,9 +306,6 @@ class NativeWindow : public base::SupportsUserData,
   // Whether window can be resized larger than screen.
   bool enable_larger_than_screen_;
 
-  // Window icon.
-  gfx::ImageSkia icon_;
-
   // The windows has been closed.
   bool is_closed_;
 
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index a04a5a0eb25e..d83e69b85324 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -221,6 +221,10 @@ NativeWindowViews::NativeWindowViews(
   std::string window_type;
   if (options.Get(options::kType, &window_type))
     SetWindowType(GetAcceleratedWidget(), window_type);
+
+  // Set window icon.
+  options.Get(options::kIcon, &icon_);
+  window_->UpdateWindowIcon();
 #endif
 
   // Add web view.
@@ -273,7 +277,6 @@ NativeWindowViews::NativeWindowViews(
       use_content_size_)
     size = ContentSizeToWindowSize(size);
 
-  window_->UpdateWindowIcon();
   window_->CenterWindow(size);
   Layout();
 }
@@ -842,13 +845,15 @@ bool NativeWindowViews::ShouldHandleSystemCommands() const {
   return true;
 }
 
+#if defined(USE_X11)
 gfx::ImageSkia NativeWindowViews::GetWindowAppIcon() {
-  return icon();
+  return icon_;
 }
 
 gfx::ImageSkia NativeWindowViews::GetWindowIcon() {
   return GetWindowAppIcon();
 }
+#endif
 
 views::Widget* NativeWindowViews::GetWidget() {
   return window_.get();
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index bcf3ca8bd16f..799c02ec32f9 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -104,12 +104,14 @@ class NativeWindowViews : public NativeWindow,
 
   gfx::AcceleratedWidget GetAcceleratedWidget() override;
 
-  views::Widget* widget() const { return window_.get(); }
-
 #if defined(OS_WIN)
+  void SetIcon(HICON small_icon, HICON app_icon);
+
   TaskbarHost& taskbar_host() { return taskbar_host_; }
 #endif
 
+  views::Widget* widget() const { return window_.get(); }
+
  private:
   // views::WidgetObserver:
   void OnWidgetActivationChanged(
@@ -125,8 +127,10 @@ class NativeWindowViews : public NativeWindow,
   bool CanMinimize() const override;
   base::string16 GetWindowTitle() const override;
   bool ShouldHandleSystemCommands() const override;
+#if defined(USE_X11)
   gfx::ImageSkia GetWindowAppIcon() override;
   gfx::ImageSkia GetWindowIcon() override;
+#endif
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
   views::View* GetContentsView() override;
@@ -145,7 +149,6 @@ class NativeWindowViews : public NativeWindow,
   // MessageHandlerDelegate:
   bool PreHandleMSG(
       UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-
   void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
 #endif
 
@@ -185,6 +188,9 @@ class NativeWindowViews : public NativeWindow,
   // we need to make sure size constraints are restored when window becomes
   // resizable again.
   extensions::SizeConstraints old_size_constraints_;
+
+  // Window icon.
+  gfx::ImageSkia icon_;
 #elif defined(OS_WIN)
   // Weak ref.
   AtomDesktopWindowTreeHostWin* atom_desktop_window_tree_host_win_;
@@ -202,7 +208,6 @@ class NativeWindowViews : public NativeWindow,
 
   // If true we have enabled a11y
   bool enabled_a11y_support_;
-
 #endif
 
   // Handles unhandled keyboard messages coming back from the renderer process.
diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
index 038ab105222d..0cb685908fec 100644
--- a/atom/browser/native_window_views_win.cc
+++ b/atom/browser/native_window_views_win.cc
@@ -73,6 +73,14 @@ const char* AppCommandToString(int command_id) {
 
 }  // namespace
 
+void NativeWindowViews::SetIcon(HICON small_icon, HICON app_icon) {
+  HWND hwnd = GetAcceleratedWidget();
+  SendMessage(hwnd, WM_SETICON, ICON_SMALL,
+              reinterpret_cast<LPARAM>(small_icon));
+  SendMessage(hwnd, WM_SETICON, ICON_BIG,
+              reinterpret_cast<LPARAM>(app_icon));
+}
+
 bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
   std::string command = AppCommandToString(command_id);
   NotifyWindowExecuteWindowsCommand(command);

From b33c04d0412c6b5341ba04d28f8eca71ce487e09 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 19:58:47 +0900
Subject: [PATCH 300/510] docs: Recommend to use ICO icon

---
 docs/api/browser-window.md | 5 +++--
 docs/api/native-image.md   | 7 ++++++-
 docs/api/tray.md           | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 93785878d146..900212c8fe6e 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -65,8 +65,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     `false`.
   * `kiosk` Boolean - The kiosk mode. Default is `false`.
   * `title` String - Default window title. Default is `"Electron"`.
-  * `icon` [NativeImage](native-image.md) - The window icon, when omitted on
-    Windows the executable's icon would be used as window icon.
+  * `icon` [NativeImage](native-image.md) - The window icon. On Windows it is
+    recommended to use `ICO` icons to get best visual effects, you can also
+    leave it undefined so the executable's icon will be used.
   * `show` Boolean - Whether window should be shown when created. Default is
     `true`.
   * `frame` Boolean - Specify `false` to create a
diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index b8479ac3b386..9790daaca49e 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -25,7 +25,12 @@ const appIcon = new Tray(image);
 Currently `PNG` and `JPEG` image formats are supported. `PNG` is recommended
 because of its support for transparency and lossless compression.
 
-On Windows, you can also load an `ICO` icon from a file path.
+On Windows, you can also load `ICO` icons from file paths, to get best visual
+effects it is recommended to include at least followings sizes in the icon:
+
+* 16x16
+* 32x32
+* 256x256
 
 ## High Resolution Image
 
diff --git a/docs/api/tray.md b/docs/api/tray.md
index 3fa6f606e90a..4c4891ef8960 100644
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -29,6 +29,7 @@ __Platform limitations:__
 * When app indicator is used on Linux, the `click` event is ignored.
 * On Linux in order for changes made to individual `MenuItem`s to take effect,
   you have to call `setContextMenu` again. For example:
+* On Windows it is recommended to use `ICO` icons to get best visual effects.
 
 ```javascript
 contextMenu.items[2].checked = false;

From a93c9462edf5ce63e8072abbf7443eebc9280a27 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 22:22:15 +0900
Subject: [PATCH 301/510] Add BrowserWindow.setIcon

---
 atom/browser/api/atom_api_window.cc      | 29 ++++++++++++++++++------
 atom/browser/api/atom_api_window.h       |  5 ++++
 atom/browser/native_window.cc            |  1 -
 atom/browser/native_window_views.cc      | 23 ++++++++-----------
 atom/browser/native_window_views.h       | 15 +++++-------
 atom/common/api/atom_api_native_image.cc | 23 +++++++++----------
 docs/api/browser-window.md               |  6 +++++
 7 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index caefd2720029..dc9f0f6a152e 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -9,7 +9,6 @@
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/browser.h"
 #include "atom/browser/native_window.h"
-#include "atom/common/api/atom_api_native_image.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
@@ -22,8 +21,11 @@
 #include "native_mate/dictionary.h"
 #include "ui/gfx/geometry/rect.h"
 
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
 #include "atom/browser/native_window_views.h"
+#endif
+
+#if defined(OS_WIN)
 #include "atom/browser/ui/win/taskbar_host.h"
 #endif
 
@@ -101,13 +103,11 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
   window_->AddObserver(this);
   AttachAsUserData(window_.get());
 
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
   // Sets the window icon.
   mate::Handle<NativeImage> icon;
-  if (options.Get(options::kIcon, &icon) && !icon.IsEmpty()) {
-    static_cast<NativeWindowViews*>(window_.get())->SetIcon(
-        icon->GetHICON(GetSystemMetrics(SM_CXSMICON)), icon->GetHICON(256));
-  }
+  if (options.Get(options::kIcon, &icon))
+    SetIcon(icon);
 #endif
 }
 
@@ -627,6 +627,18 @@ void Window::ShowDefinitionForSelection() {
 }
 #endif
 
+#if defined(TOOLKIT_VIEWS)
+void Window::SetIcon(mate::Handle<NativeImage> icon) {
+#if defined(OS_WIN)
+  static_cast<NativeWindowViews*>(window_.get())->SetIcon(
+      icon->GetHICON(GetSystemMetrics(SM_CXSMICON)), icon->GetHICON(256));
+#elif defined(USE_X11)
+  static_cast<NativeWindowViews*>(window_.get())->SetIcon(
+      icon->image().AsImageSkia());
+#endif
+}
+#endif
+
 void Window::SetAspectRatio(double aspect_ratio, mate::Arguments* args) {
   gfx::Size extra_size;
   args->GetNext(&extra_size);
@@ -748,6 +760,9 @@ void Window::BuildPrototype(v8::Isolate* isolate,
 #if defined(OS_MACOSX)
       .SetMethod("showDefinitionForSelection",
                  &Window::ShowDefinitionForSelection)
+#endif
+#if defined(TOOLKIT_VIEWS)
+      .SetMethod("setIcon", &Window::SetIcon)
 #endif
       .SetProperty("id", &Window::ID)
       .SetProperty("webContents", &Window::WebContents);
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index a00e063d99f8..7746dd8d7681 100644
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -14,6 +14,7 @@
 #include "atom/browser/api/trackable_object.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/native_window_observer.h"
+#include "atom/common/api/atom_api_native_image.h"
 #include "native_mate/handle.h"
 
 class GURL;
@@ -172,6 +173,10 @@ class Window : public mate::TrackableObject<Window>,
   void ShowDefinitionForSelection();
 #endif
 
+#if defined(TOOLKIT_VIEWS)
+  void SetIcon(mate::Handle<NativeImage> icon);
+#endif
+
   void SetVisibleOnAllWorkspaces(bool visible);
   bool IsVisibleOnAllWorkspaces();
 
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index f0c0864a519b..23a434a81b45 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -12,7 +12,6 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/window_list.h"
 #include "atom/common/api/api_messages.h"
-#include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/files/file_util.h"
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index d83e69b85324..42da62ccb0f1 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -11,6 +11,7 @@
 #include "atom/browser/ui/views/menu_layout.h"
 #include "atom/common/color_util.h"
 #include "atom/common/draggable_region.h"
+#include "atom/common/native_mate_converters/image_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/strings/utf_string_conversions.h"
 #include "brightray/browser/inspectable_web_contents.h"
@@ -40,6 +41,7 @@
 #include "chrome/browser/ui/libgtk2ui/unity_service.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/x/x11_types.h"
+#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #include "ui/views/window/native_frame_view.h"
 #elif defined(OS_WIN)
 #include "atom/browser/ui/views/win_frame_view.h"
@@ -221,10 +223,6 @@ NativeWindowViews::NativeWindowViews(
   std::string window_type;
   if (options.Get(options::kType, &window_type))
     SetWindowType(GetAcceleratedWidget(), window_type);
-
-  // Set window icon.
-  options.Get(options::kIcon, &icon_);
-  window_->UpdateWindowIcon();
 #endif
 
   // Add web view.
@@ -781,6 +779,13 @@ gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() {
   return GetNativeWindow()->GetHost()->GetAcceleratedWidget();
 }
 
+void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
+  views::DesktopWindowTreeHostX11* tree_host =
+      views::DesktopWindowTreeHostX11::GetHostForXID(GetAcceleratedWidget());
+  static_cast<views::DesktopWindowTreeHost*>(tree_host)->SetWindowIcons(
+      icon, icon);
+}
+
 void NativeWindowViews::OnWidgetActivationChanged(
     views::Widget* widget, bool active) {
   if (widget != window_.get())
@@ -845,16 +850,6 @@ bool NativeWindowViews::ShouldHandleSystemCommands() const {
   return true;
 }
 
-#if defined(USE_X11)
-gfx::ImageSkia NativeWindowViews::GetWindowAppIcon() {
-  return icon_;
-}
-
-gfx::ImageSkia NativeWindowViews::GetWindowIcon() {
-  return GetWindowAppIcon();
-}
-#endif
-
 views::Widget* NativeWindowViews::GetWidget() {
   return window_.get();
 }
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 799c02ec32f9..8a5d8ae0e082 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -106,12 +106,16 @@ class NativeWindowViews : public NativeWindow,
 
 #if defined(OS_WIN)
   void SetIcon(HICON small_icon, HICON app_icon);
-
-  TaskbarHost& taskbar_host() { return taskbar_host_; }
+#elif defined(USE_X11)
+  void SetIcon(const gfx::ImageSkia& icon);
 #endif
 
   views::Widget* widget() const { return window_.get(); }
 
+#if defined(OS_WIN)
+  TaskbarHost& taskbar_host() { return taskbar_host_; }
+#endif
+
  private:
   // views::WidgetObserver:
   void OnWidgetActivationChanged(
@@ -127,10 +131,6 @@ class NativeWindowViews : public NativeWindow,
   bool CanMinimize() const override;
   base::string16 GetWindowTitle() const override;
   bool ShouldHandleSystemCommands() const override;
-#if defined(USE_X11)
-  gfx::ImageSkia GetWindowAppIcon() override;
-  gfx::ImageSkia GetWindowIcon() override;
-#endif
   views::Widget* GetWidget() override;
   const views::Widget* GetWidget() const override;
   views::View* GetContentsView() override;
@@ -188,9 +188,6 @@ class NativeWindowViews : public NativeWindow,
   // we need to make sure size constraints are restored when window becomes
   // resizable again.
   extensions::SizeConstraints old_size_constraints_;
-
-  // Window icon.
-  gfx::ImageSkia icon_;
 #elif defined(OS_WIN)
   // Weak ref.
   AtomDesktopWindowTreeHostWin* atom_desktop_window_tree_host_win_;
diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index 970f22cc68a5..d5a75e3f440b 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -295,22 +295,21 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
 mate::Handle<NativeImage> NativeImage::CreateFromPath(
     v8::Isolate* isolate, const base::FilePath& path) {
   base::FilePath image_path = NormalizePath(path);
-  if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
 #if defined(OS_WIN)
+  if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
     return mate::CreateHandle(isolate,
                               new NativeImage(isolate, image_path));
-#endif
-  } else {
-    gfx::ImageSkia image_skia;
-    PopulateImageSkiaRepsFromPath(&image_skia, image_path);
-    gfx::Image image(image_skia);
-    mate::Handle<NativeImage> handle = Create(isolate, image);
-#if defined(OS_MACOSX)
-    if (IsTemplateFilename(image_path))
-      handle->SetTemplateImage(true);
-#endif
-    return handle;
   }
+#endif
+  gfx::ImageSkia image_skia;
+  PopulateImageSkiaRepsFromPath(&image_skia, image_path);
+  gfx::Image image(image_skia);
+  mate::Handle<NativeImage> handle = Create(isolate, image);
+#if defined(OS_MACOSX)
+  if (IsTemplateFilename(image_path))
+    handle->SetTemplateImage(true);
+#endif
+  return handle;
 }
 
 // static
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 900212c8fe6e..aa21e5fd59ad 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -886,6 +886,12 @@ The `flags` is an array that can include following `String`s:
 
 Shows pop-up dictionary that searches the selected word on the page.
 
+### `win.setIcon(icon)` _Windows_ _Linux_
+
+* `icon` [NativeImage](native-image.md)
+
+Changes window icon.
+
 ### `win.setAutoHideMenuBar(hide)`
 
 * `hide` Boolean

From 3182485e6882e7ddd6d778e6da9c62f3157619ef Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 20 May 2016 22:28:07 +0900
Subject: [PATCH 302/510] No need to reference the icon in Tray

---
 atom/browser/api/atom_api_tray.cc       |  2 --
 atom/browser/api/atom_api_tray.h        |  2 --
 atom/browser/native_window_views.cc     | 10 ++++++++++
 atom/browser/native_window_views_win.cc |  8 --------
 atom/browser/ui/win/notify_icon.cc      |  6 +++---
 atom/browser/ui/win/notify_icon.h       |  3 ++-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
index 5de3b63a4ce7..c84e8a1d66b6 100644
--- a/atom/browser/api/atom_api_tray.cc
+++ b/atom/browser/api/atom_api_tray.cc
@@ -97,7 +97,6 @@ void Tray::OnDragEnded() {
 }
 
 void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
-  image_.Reset(isolate, image.ToV8());
 #if defined(OS_WIN)
   tray_icon_->SetImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
 #else
@@ -107,7 +106,6 @@ void Tray::SetImage(v8::Isolate* isolate, mate::Handle<NativeImage> image) {
 
 void Tray::SetPressedImage(v8::Isolate* isolate,
                            mate::Handle<NativeImage> image) {
-  pressed_image_.Reset(isolate, image.ToV8());
 #if defined(OS_WIN)
   tray_icon_->SetPressedImage(image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
 #else
diff --git a/atom/browser/api/atom_api_tray.h b/atom/browser/api/atom_api_tray.h
index 312185aed408..3c3d02e9ca40 100644
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -69,8 +69,6 @@ class Tray : public mate::TrackableObject<Tray>,
  private:
   v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
 
-  v8::Global<v8::Object> image_;
-  v8::Global<v8::Object> pressed_image_;
   v8::Global<v8::Object> menu_;
   scoped_ptr<TrayIcon> tray_icon_;
 
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 42da62ccb0f1..82c1158bdcf1 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -779,12 +779,22 @@ gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() {
   return GetNativeWindow()->GetHost()->GetAcceleratedWidget();
 }
 
+#if defined(OS_WIN)
+void NativeWindowViews::SetIcon(HICON small_icon, HICON app_icon) {
+  HWND hwnd = GetAcceleratedWidget();
+  SendMessage(hwnd, WM_SETICON, ICON_SMALL,
+              reinterpret_cast<LPARAM>(small_icon));
+  SendMessage(hwnd, WM_SETICON, ICON_BIG,
+              reinterpret_cast<LPARAM>(app_icon));
+}
+#elif defined(USE_X11)
 void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
   views::DesktopWindowTreeHostX11* tree_host =
       views::DesktopWindowTreeHostX11::GetHostForXID(GetAcceleratedWidget());
   static_cast<views::DesktopWindowTreeHost*>(tree_host)->SetWindowIcons(
       icon, icon);
 }
+#endif
 
 void NativeWindowViews::OnWidgetActivationChanged(
     views::Widget* widget, bool active) {
diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
index 0cb685908fec..038ab105222d 100644
--- a/atom/browser/native_window_views_win.cc
+++ b/atom/browser/native_window_views_win.cc
@@ -73,14 +73,6 @@ const char* AppCommandToString(int command_id) {
 
 }  // namespace
 
-void NativeWindowViews::SetIcon(HICON small_icon, HICON app_icon) {
-  HWND hwnd = GetAcceleratedWidget();
-  SendMessage(hwnd, WM_SETICON, ICON_SMALL,
-              reinterpret_cast<LPARAM>(small_icon));
-  SendMessage(hwnd, WM_SETICON, ICON_BIG,
-              reinterpret_cast<LPARAM>(app_icon));
-}
-
 bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
   std::string command = AppCommandToString(command_id);
   NotifyWindowExecuteWindowsCommand(command);
diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index 98c967e5c8fc..1cc616216c6e 100644
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -25,7 +25,6 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host,
       icon_id_(id),
       window_(window),
       message_id_(message),
-      icon_(NULL),
       menu_model_(NULL) {
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
@@ -80,7 +79,7 @@ void NotifyIcon::ResetIcon() {
   InitIconData(&icon_data);
   icon_data.uFlags |= NIF_MESSAGE;
   icon_data.uCallbackMessage = message_id_;
-  icon_data.hIcon = icon_;
+  icon_data.hIcon = icon_.get();
   // If we have an image, then set the NIF_ICON flag, which tells
   // Shell_NotifyIcon() to set the image for the status icon it creates.
   if (icon_data.hIcon)
@@ -92,8 +91,9 @@ void NotifyIcon::ResetIcon() {
 }
 
 void NotifyIcon::SetImage(HICON image) {
+  icon_ = base::win::ScopedHICON(CopyIcon(image));
+
   // Create the icon.
-  icon_ = image;
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags |= NIF_ICON;
diff --git a/atom/browser/ui/win/notify_icon.h b/atom/browser/ui/win/notify_icon.h
index 1c6f240a0cea..95e9945a17f8 100644
--- a/atom/browser/ui/win/notify_icon.h
+++ b/atom/browser/ui/win/notify_icon.h
@@ -14,6 +14,7 @@
 #include "base/macros.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/win/scoped_gdi_object.h"
 
 namespace gfx {
 class Point;
@@ -70,7 +71,7 @@ class NotifyIcon : public TrayIcon {
   UINT message_id_;
 
   // The currently-displayed icon for the window.
-  HICON icon_;
+  base::win::ScopedHICON icon_;
 
   // The context menu.
   ui::SimpleMenuModel* menu_model_;

From 25cb0fcbb93804c1fff8d314c31143809af1063e Mon Sep 17 00:00:00 2001
From: Matt Karl <matt.karl@jibo.com>
Date: Fri, 20 May 2016 11:04:10 -0400
Subject: [PATCH 303/510] Added Learn More button

---
 default_app/main.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index f4ca5f14a657..c53bb56df3d1 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -253,13 +253,16 @@ function loadApplicationPackage (packagePath) {
   } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') {
       app.focus()
-      dialog.showErrorBox(
-        'Error opening app',
-        'Unable to open or find an Electron app. The docs on how to write an app can be found here:\n' +
-        `https://github.com/electron/electron/tree/v${process.versions.electron}/docs
-
-${e.toString()}`
-      )
+      dialog.showMessageBox({
+        message: 'Error opening app',
+        detail: 'Unable to open or find an Electron app. Click to learn more on how to write an app.\n\n' +
+            `${e.toString()}`,
+        buttons: ['Learn More', 'OK']
+      }, (response) => {
+        if (response === 0) {
+          shell.openExternal(`https://github.com/electron/electron/tree/v${process.versions.electron}/docs`)
+        }
+      })
       process.exit(1)
     } else {
       console.error('App threw an error when running', e)

From f266b979af0e78086cf6811b54ae9ffe23b89d44 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 20 May 2016 09:25:10 -0700
Subject: [PATCH 304/510] Capitalize Object

---
 docs/api/file-object.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/file-object.md b/docs/api/file-object.md
index 2484e960e909..d0f36e273dfa 100644
--- a/docs/api/file-object.md
+++ b/docs/api/file-object.md
@@ -1,4 +1,4 @@
-# `File` object
+# `File` Object
 
 > Use the HTML5 `File` API to work natively with files on the filesystem.
 

From a1e59b814c81d256936ccba37bfa70669fb14579 Mon Sep 17 00:00:00 2001
From: Matt Karl <matt.karl@jibo.com>
Date: Fri, 20 May 2016 13:29:42 -0400
Subject: [PATCH 305/510] Changed default button, updated link

---
 default_app/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index c53bb56df3d1..6085b021b190 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -255,12 +255,12 @@ function loadApplicationPackage (packagePath) {
       app.focus()
       dialog.showMessageBox({
         message: 'Error opening app',
-        detail: 'Unable to open or find an Electron app. Click to learn more on how to write an app.\n\n' +
+        detail: 'Unable to open or find an Electron app.\n\n' +
             `${e.toString()}`,
-        buttons: ['Learn More', 'OK']
+        buttons: ['OK', 'Learn More']
       }, (response) => {
-        if (response === 0) {
-          shell.openExternal(`https://github.com/electron/electron/tree/v${process.versions.electron}/docs`)
+        if (response === 1) {
+          shell.openExternal(`http://electron.atom.io/docs`)
         }
       })
       process.exit(1)

From b08393a663d16468a7060a74e14be44a8985b3ac Mon Sep 17 00:00:00 2001
From: Matt Karl <matt.karl@jibo.com>
Date: Fri, 20 May 2016 16:01:08 -0400
Subject: [PATCH 306/510] Fixed linting error

---
 default_app/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default_app/main.js b/default_app/main.js
index 6085b021b190..9c75a23d6fc2 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -260,7 +260,7 @@ function loadApplicationPackage (packagePath) {
         buttons: ['OK', 'Learn More']
       }, (response) => {
         if (response === 1) {
-          shell.openExternal(`http://electron.atom.io/docs`)
+          shell.openExternal('http://electron.atom.io/docs')
         }
       })
       process.exit(1)

From d983eb42e6c8691ed6bd14bf2e2de2f92acb6245 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 20 May 2016 13:58:48 -0700
Subject: [PATCH 307/510] Use ### for headings for consistency

---
 docs/api/environment-variables.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index 819af6c99ec6..d4991a44a3ab 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -19,36 +19,36 @@ on Windows console:
 > electron
 ```
 
-## `ELECTRON_RUN_AS_NODE`
+### `ELECTRON_RUN_AS_NODE`
 
 Starts the process as a normal Node.js process.
 
-## `ELECTRON_ENABLE_LOGGING`
+### `ELECTRON_ENABLE_LOGGING`
 
 Prints Chrome's internal logging to console.
 
-## `ELECTRON_LOG_ASAR_READS`
+### `ELECTRON_LOG_ASAR_READS`
 
 When Electron reads from an ASAR file, log the read offset and file path to
 the system `tmpdir`. The resulting file can be provided to the ASAR module
 to optimize file ordering.
 
-## `ELECTRON_ENABLE_STACK_DUMPING`
+### `ELECTRON_ENABLE_STACK_DUMPING`
 
 When Electron crashed, prints the stack trace to console.
 
 This environment variable will not work if `crashReporter` is started.
 
-## `ELECTRON_DEFAULT_ERROR_MODE` _Windows_
+### `ELECTRON_DEFAULT_ERROR_MODE` _Windows_
 
 Shows Windows's crash dialog when Electron crashed.
 
 This environment variable will not work if `crashReporter` is started.
 
-## `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
+### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
 
 Don't attach to current console session.
 
-## `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
+### `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
 
 Don't use global menu bar on Linux.

From d56c36b4a78721e3010932d857b8cce87347e092 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 20 May 2016 14:01:08 -0700
Subject: [PATCH 308/510] Minor wording updates

---
 docs/api/environment-variables.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index d4991a44a3ab..260c63126138 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -25,7 +25,7 @@ Starts the process as a normal Node.js process.
 
 ### `ELECTRON_ENABLE_LOGGING`
 
-Prints Chrome's internal logging to console.
+Prints Chrome's internal logging to the console.
 
 ### `ELECTRON_LOG_ASAR_READS`
 
@@ -35,20 +35,20 @@ to optimize file ordering.
 
 ### `ELECTRON_ENABLE_STACK_DUMPING`
 
-When Electron crashed, prints the stack trace to console.
+When Electron crashes, prints the stack trace to the console.
 
-This environment variable will not work if `crashReporter` is started.
+This environment variable will not work if the `crashReporter` is started.
 
 ### `ELECTRON_DEFAULT_ERROR_MODE` _Windows_
 
-Shows Windows's crash dialog when Electron crashed.
+Shows the Windows's crash dialog when Electron crashes.
 
-This environment variable will not work if `crashReporter` is started.
+This environment variable will not work if the `crashReporter` is started.
 
 ### `ELECTRON_NO_ATTACH_CONSOLE` _Windows_
 
-Don't attach to current console session.
+Don't attach to the current console session.
 
 ### `ELECTRON_FORCE_WINDOW_MENU_BAR` _Linux_
 
-Don't use global menu bar on Linux.
+Don't use the global menu bar on Linux.

From 588420ecd228fcef1f491e5f570df677485cfbc3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 20 May 2016 14:02:10 -0700
Subject: [PATCH 309/510] Use active voice

---
 docs/api/environment-variables.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index 260c63126138..840d0ba93479 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -35,7 +35,7 @@ to optimize file ordering.
 
 ### `ELECTRON_ENABLE_STACK_DUMPING`
 
-When Electron crashes, prints the stack trace to the console.
+Prints the stack trace to the console when Electron crashes.
 
 This environment variable will not work if the `crashReporter` is started.
 

From e1d9229507f7a05535902e3a51939558a7c11749 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 20 May 2016 14:03:28 -0700
Subject: [PATCH 310/510] Tweak intro sentence

---
 docs/api/environment-variables.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index 840d0ba93479..f2de1284d1c3 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -2,8 +2,8 @@
 
 > Control application configuration and behavior without changing code.
 
-Some behaviors of Electron are controlled by environment variables, because they
-are initialized earlier than command line and the app's code.
+Certain Electron behaviors are controlled by environment variables because they
+are initialized earlier than the command line flags and the app's code.
 
 Examples on POSIX shells:
 

From f16f48aa7c6b29a84e374ff92e8ebd53b5e94fb7 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 20 May 2016 14:03:56 -0700
Subject: [PATCH 311/510] Tweak example intros

---
 docs/api/environment-variables.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index f2de1284d1c3..a4df27504b57 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -5,14 +5,14 @@
 Certain Electron behaviors are controlled by environment variables because they
 are initialized earlier than the command line flags and the app's code.
 
-Examples on POSIX shells:
+POSIX shell example:
 
 ```bash
 $ export ELECTRON_ENABLE_LOGGING=true
 $ electron
 ```
 
-on Windows console:
+Windows console example:
 
 ```powershell
 > set ELECTRON_ENABLE_LOGGING=true

From 0e63050916ce847d38245bf9d35d807996141ff4 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 20 May 2016 14:20:48 -0700
Subject: [PATCH 312/510] Default to amd64 on Windows

---
 script/lib/config.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index e879d7a21c42..01efebfd4fe8 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -38,10 +38,7 @@ def get_target_arch():
     if e.errno != errno.ENOENT:
       raise
 
-  if PLATFORM == 'win32':
-    return 'ia32'
-  else:
-    return 'x64'
+  return 'x64'
 
 
 def get_chromedriver_version():

From c9b314d43ca8f5ea438216f1b0377ddf5c26e46f Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sat, 21 May 2016 10:21:15 +0530
Subject: [PATCH 313/510] renderer: generate net error strings when requested

---
 atom/renderer/atom_renderer_client.cc | 14 ++++++++++++++
 atom/renderer/atom_renderer_client.h  |  5 +++++
 spec/api-browser-window-spec.js       |  1 +
 3 files changed, 20 insertions(+)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index bb5b81ba4199..aa93f63aa2bb 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -18,6 +18,7 @@
 #include "atom/renderer/guest_view_container.h"
 #include "atom/renderer/node_array_buffer_bridge.h"
 #include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/renderer/media/chrome_key_systems.h"
 #include "chrome/renderer/pepper/pepper_helper.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
@@ -28,6 +29,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"
+#include "net/base/net_errors.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -252,4 +254,16 @@ void AtomRendererClient::AddKeySystems(
   AddChromeKeySystems(key_systems);
 }
 
+void AtomRendererClient::GetNavigationErrorStrings(
+    content::RenderFrame* render_frame,
+    const blink::WebURLRequest& failed_request,
+    const blink::WebURLError& error,
+    std::string* error_html,
+    base::string16* error_description) {
+  if (!error_description)
+    return;
+
+  *error_description = base::UTF8ToUTF16(net::ErrorToShortString(error.reason));
+}
+
 }  // namespace atom
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 6e962bc4c04e..11d6028928a0 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -58,6 +58,11 @@ class AtomRendererClient : public content::ContentRendererClient,
       const std::string& mime_type,
       const GURL& original_url) override;
   void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
+  void GetNavigationErrorStrings(content::RenderFrame* render_frame,
+                                 const blink::WebURLRequest& failed_request,
+                                 const blink::WebURLError& error,
+                                 std::string* error_html,
+                                 base::string16* error_description) override;
 
   scoped_ptr<NodeBindings> node_bindings_;
   scoped_ptr<AtomBindings> atom_bindings_;
diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 52af001d765f..ac85f49068d4 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -148,6 +148,7 @@ describe('browser-window module', function () {
     it('should emit did-fail-load event for files that do not exist', function (done) {
       w.webContents.on('did-fail-load', function (event, code, desc, url, isMainFrame) {
         assert.equal(code, -6)
+        assert.equal(desc, 'ERR_FILE_NOT_FOUND')
         assert.equal(isMainFrame, true)
         done()
       })

From 363ab2075c561be945d4e5d18ad79827aeffb425 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 21 May 2016 20:48:06 +0900
Subject: [PATCH 314/510] Update libchromiumcontent for #5618

---
 script/lib/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index e879d7a21c42..7c14e6c99e82 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '7509afe48dbb438e921e5fccf08603340b41c308'
+LIBCHROMIUMCONTENT_COMMIT = 'afdc76a15e66a6a3aeefdc047b34c99eec7f5611'
 
 PLATFORM = {
   'cygwin': 'win32',

From 77eb0e8e3f9e58e2dda0d9b123ac565b81e9394d Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Fri, 20 May 2016 21:20:53 +0900
Subject: [PATCH 315/510] Japanese manual: Update tutorials and api

[ci skip]
---
 .../jp/api/chrome-command-line-switches.md    | 30 ++++---
 .../jp/api/environment-variables.md           |  5 +-
 docs-translations/jp/api/process.md           | 75 ++++++++++++++---
 docs-translations/jp/api/synopsis.md          | 39 +++++----
 .../desktop-environment-integration.md        | 50 ++++++------
 .../jp/tutorial/online-offline-events.md      | 22 ++---
 docs-translations/jp/tutorial/quick-start.md  | 80 +++++++++++--------
 7 files changed, 185 insertions(+), 116 deletions(-)

diff --git a/docs-translations/jp/api/chrome-command-line-switches.md b/docs-translations/jp/api/chrome-command-line-switches.md
index b3359eb322ce..b041cf3baffb 100644
--- a/docs-translations/jp/api/chrome-command-line-switches.md
+++ b/docs-translations/jp/api/chrome-command-line-switches.md
@@ -1,29 +1,32 @@
 #サポートしているChromeコマンドラインスイッチ
 
-ElectronでサポートしているChromeブラウザーで使用できるコマンドラインスイッチをこのページで一覧にしています。[app][app]モジュールの[ready][ready]イベントが出力される前にアプリのメインスクリプトに追加するために[app.commandLine.appendSwitch][append-switch]を使えます。
+> Electronでサポートされているコマンドラインスイッチ
+
+アプリケーションのメインスクリプトで[app.commandLine.appendSwitch][append-switch]を使うことで、[app][app]モジュールの[ready][ready]イベントが発行される前にコマンドラインスイッチを追加できます。
 
 ```javascript
-const app = require('electron').app;
+const {app} = require('electron');
 app.commandLine.appendSwitch('remote-debugging-port', '8315');
 app.commandLine.appendSwitch('host-rules', 'MAP * 127.0.0.1');
 
-app.on('ready', function() {
+app.on('ready', () => {
   // Your code here
 });
 ```
 
-## --client-certificate=`path`
-
-クライアントの証明書ファイルの`path`を設定します。
 
 ## --ignore-connections-limit=`domains`
 
-接続数の制限を無視する`,`で分割した`domains`リスト
+`domains`で指定されたリストは接続数制限を無視します。リストは`,`で区切られます。
 
 ## --disable-http-cache
 
 HTTPリクエストのディスクキャッシュの無効化。
 
+## --disable-http2
+
+HTTP/2 と SPDY/3.1 プロトコルを無効にします。
+
 ## --remote-debugging-port=`port`
 
 `port`で指定したHTTP越しのリモートデバッグの有効化。
@@ -42,7 +45,8 @@ $ electron --js-flags="--harmony_proxies --harmony_collections" your-app
 
 ## --proxy-bypass-list=`hosts`
 
-ホスト一覧をセミコロンで分割したプロキシサーバーをバイパスしてするためにElectronに指示します。このフラグは、`--proxy-server`と同時に使われるときのみに影響します。
+プロキシを使用しないサーバーをセミコロンで区切って指定します。
+このフラグは、`--proxy-server`と同時に使われるときのみに影響します。
 
 例:
 
@@ -50,7 +54,7 @@ $ electron --js-flags="--harmony_proxies --harmony_collections" your-app
 app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com;1.2.3.4:5678')
 ```
 
-ロカールアドレス（`localhost`や`127.0.0.1`など）、`google.com`サブドメイン、`foo.com` サフィックスを含むホスト、`1.2.3.4:5678`を除いてすべてのホストでプロキシサーバーが使われます。
+ローカルアドレス（`localhost`や`127.0.0.1`など）、`google.com`サブドメイン、`foo.com` サフィックスを含むホスト、`1.2.3.4:5678`を除いてすべてのホストでプロキシサーバーが使われます。
 
 ## --proxy-pac-url=`url`
 
@@ -58,7 +62,7 @@ app.commandLine.appendSwitch('proxy-bypass-list', '<local>;*.google.com;*foo.com
 
 ## --no-proxy-server
 
-プロキシサーバーを使わず、常に直接接続します。遠輝ほかのプロキシサーバーフラグを上書きします。
+プロキシサーバーを使わず、常に直接接続します。ほかのプロキシサーバーフラグを上書きします。
 
 ## --host-rules=`rules`
 
@@ -105,17 +109,17 @@ TLSフォールバックを許可する最小のSSL/TLSバージョン ("tls1"
 
 不可視のページのレンダラープロセスの優先度を下げることからChromiumを防ぎます。
 
-このフラグは、グローバルですべてのレンダラープロセスに有効で、一つのウィンドウだけで無効化したい場合、[playing silent audio][play-silent-audio]をハックして対応します。
+このフラグは、グローバルですべてのレンダラープロセスに有効で、一つのウィンドウだけで無効化したい場合、[無音を再生する][play-silent-audio]というハックで対応します。
 
 ## --enable-logging
 
 コンソールにChromiumのログを出力します。
 
-このスイッチは`app.commandLine.appendSwitch` で使えず、アプリがロードされるよりもパースしますが、同じ効果を受けるために`ELECTRON_ENABLE_LOGGING`を環境変数に設定します。
+ユーザーのアプリが読み込まれる前に解析されるため、`app.commandLine.appendSwitch`では使用できませんが、`ELECTRON_ENABLE_LOGGING`を環境変数に設定すると同じ効果を得ることができます。
 
 ## --v=`log_level`
 
-既定の最大アクティブなV-loggingレベルが付与されています。0が既定です。通常、正の値はV-loggingレベルに使用されます。
+標準のloggingレベルを設定します。0が既定です。通常、V-loggingレベルには正の値が使用されます。
 
 `--enable-logging` が渡された時だけ、このスイッチは動作します。
 
diff --git a/docs-translations/jp/api/environment-variables.md b/docs-translations/jp/api/environment-variables.md
index f5277f146591..75c0ab0c2a9a 100644
--- a/docs-translations/jp/api/environment-variables.md
+++ b/docs-translations/jp/api/environment-variables.md
@@ -1,5 +1,7 @@
 # 環境変数
 
+> アプリケーションの設定や動作を、コードの変更なしで制御します。
+
 コマンドラインやアプリのコードよりも早く初期化されるために、Electronのいくつかの挙動は環境変数がコントロールしています。
 
 POSIX shellでの例:
@@ -47,6 +49,3 @@ Electronがクラッシュしたとき、Windowsのクラッシュダイアロ
 
 Linuxでグローバルメニューバーを使用できません。
 
-## `ELECTRON_HIDE_INTERNAL_MODULES`
-
-`require('ipc')`のような古い組み込みモジュールとの互換モードを無効にします。
diff --git a/docs-translations/jp/api/process.md b/docs-translations/jp/api/process.md
index 6ad3c32d76fe..0f9d60f5a3ad 100644
--- a/docs-translations/jp/api/process.md
+++ b/docs-translations/jp/api/process.md
@@ -1,20 +1,16 @@
 # process
 
-Electronの`process`オブジェクトは上流nodeの1つから次のような違いがあります。
+> processオブジェクトの拡張。
 
-* `process.type` String - プロセスの種類で、`browser` (例　メインプロセス)または `renderer`を設定できます。
-* `process.versions.electron` String - Electronのバージョン
-* `process.versions.chrome` String - Chromiumのバージョン
-* `process.resourcesPath` String - JavaScriptのソースコードのパスを設定します。
-* `process.mas` Boolean - Mac app Store用のビルドで、値は`true`です。ほかのビルドの場合は`undefined`です。
+Electronの`process`オブジェクトは次のようなAPIで拡張されています。
 
 ## イベント
 
 ### イベント: 'loaded'
 
-Electronは内部の初期化スクリプトをロードしたとき出力され、ウェブページまたはメインスクリプトのロードが始まります。
+このイベントはElectronが内部の初期化スクリプトをロードし、ウェブページまたはメインスクリプトのロードが始まるときに発行されます。
 
-Node統合がオフになっているとき、削除したNodeグローバルシンボルをグローバルスコープへ戻してプリロードスクリプトで使用できます。
+Node統合がオフになっているとき、削除したNodeグローバルシンボルをグローバルスコープへ戻すために、プリロードスクリプトで使用できます。
 
 ```js
 // preload.js
@@ -32,16 +28,73 @@ process.once('loaded', function() {
 
 これを`true`に設定すると、Nodeのビルトインモジュールで、`asar`アーカイブのサポートを無効にできます。
 
+### `process.type` 
+
+現在のプロセスのタイプで、`"browser"`(例: メインプロセス) または `"renderer"`の値をとります。
+
+### `process.versions.electron` 
+
+Electronのバージョン文字列です。
+
+### `process.versions.chrome`
+
+Chromeのバージョン文字列です。
+
+### `process.resourcesPath`
+
+リソースディレクトリのパスです。
+
+### `process.mas`
+
+Mac app Store用のビルドでは値は`true`になります。ほかのビルドの場合は`undefined`です。
+
+### `process.windowsStore`
+
+Windows Store App (appx)として動作中の場合は、値は`true`になります。それ以外では`undefined`です。
+
+### `process.defaultApp`
+
+アプリがdefault appのパラメータとして渡されて起動された場合は、値は`true`になります。
+
+訳注: [issue #4690](https://github.com/electron/electron/issues/4690)が参考になります。
+
+
 ## メソッド
 
-`process`オブジェクトは次のめっそどを持ちます。
+`process`オブジェクトは次のメソッドを持ちます。
+
+
+### `process.crash()`
+
+このプロセスのメインスレッドをクラッシュさせます。
 
 ### `process.hang()`
 
-現在のプロセスがハングしているメインスレッドが原因で発生します。
+このプロセスのメインスレッドをハングさせます。
 
 ### `process.setFdLimit(maxDescriptors)` _OS X_ _Linux_
 
 * `maxDescriptors` Integer
 
-現在のプロセスで、`maxDescriptors`またはOSハード制限のどちらか低いほうで、ソフトファイルディスクリプターを設定します。
+ファイルデスクリプタの最大数のソフトリミットを、`maxDescriptors`かOSのハードリミットの、どちらか低い方に設定します。
+
+### `process.getProcessMemoryInfo()`
+
+本プロセスのメモリ使用統計に関する情報を得ることのできるオブジェクトを返します。全ての報告値はキロバイト単位であることに注意してください。
+
+* `workingSetSize` - 実際の物理メモリに固定されているメモリサイズです。
+* `peakWorkingSetSize` - これまでに実際の物理メモリに固定された最大のメモリサイズです。
+* `privateBytes` - JS heapやHTML contentなど、他のプロセスに共有されていないメモリサイズです。
+* `sharedBytes` - プロセス間で共有されているメモリサイズです。例えばElectronそのものにより使用されたメモリがこれに当たります。
+
+### `process.getSystemMemoryInfo()`
+
+システム全体で使用されているメモリ使用統計に関する情報を得ることのできるオブジェクトを返します。全ての報告値はキロバイト単位であることに注意してください。
+
+* `total` - システムで使用可能な全ての物理メモリのサイズ(KB)です。
+* `free` - アプリケーションやディスクキャッシュで使用されていないメモリのサイズです。
+
+Windows / Linux用:
+
+* `swapTotal` - システムで使用可能なスワップメモリの総サイズです。
+* `swapFree` - システムで使用可能なスワップメモリの空きサイズです。
diff --git a/docs-translations/jp/api/synopsis.md b/docs-translations/jp/api/synopsis.md
index 89d8973a14ba..fdbdb1605903 100644
--- a/docs-translations/jp/api/synopsis.md
+++ b/docs-translations/jp/api/synopsis.md
@@ -1,5 +1,7 @@
 # 概要
 
+> どうやってNode.jsとElectronのAPIを使うか。
+
 Electron では全ての [Node.js のビルトインモジュール](http://nodejs.org/api/) 利用可能です。また、サードパーティの Node モジュール ([ネイティブモジュール](../tutorial/using-native-node-modules.md)も含む) も完全にサポートされています。
 
 Electron はネイティブのデスクトップアプリケーション開発のための幾つかの追加のビルトインモジュールも提供しています。メインプロセスでだけ使えるモジュールもあれば、レンダラプロセス(ウェブページ)でだけ使えるモジュール、あるいはメインプロセス、レンダラプロセスどちらでも使えるモジュールもあります。
@@ -9,15 +11,13 @@ Electron はネイティブのデスクトップアプリケーション開発
 メインプロセススクリプトは普通の Node.js スクリプトのようなものです：
 
 ```javascript
-const electron = require('electron');
-const app = electron.app;
-const BrowserWindow = electron.BrowserWindow;
+const {app, BrowserWindow} = require('electron');
 
-var window = null;
+let win = null;
 
-app.on('ready', function() {
-  window = new BrowserWindow({width: 800, height: 600});
-  window.loadURL('https://github.com');
+app.on('ready', () => {
+  win = new BrowserWindow({width: 800, height: 600});
+  win.loadURL('https://github.com');
 });
 ```
 
@@ -28,8 +28,8 @@ app.on('ready', function() {
 <html>
 <body>
 <script>
-  const remote = require('electron').remote;
-  console.log(remote.app.getVersion());
+  const {app} = require('electron').remote;
+  console.log(app.getVersion());
 </script>
 </body>
 </html>
@@ -39,28 +39,25 @@ app.on('ready', function() {
 
 ## 分割代入
 
-CoffeeScript か Babel を使っているなら、[分割代入][desctructuring-assignment]でビルトインモジュールの使用をより簡単にできます：
+0.37の時点で、 、[分割代入][desctructuring-assignment]でビルトインモジュールの使用をより簡単にできます：
 
 ```javascript
-const {app, BrowserWindow} = require('electron')
+const {app, BrowserWindow} = require('electron');
 ```
 
-しかし、素の JavaScript を使っている場合、Chrome が ES6 を完全サポートするまで待たなければいけません。
-
-## Disable old styles of using built-in modules
-
-v0.35.0 以前は全てのビルトインモジュールは `require('module-name')` の形式で使われなければいけません。この形式は[多くの欠点][issue-387]がありますが、古いアプリケーションとの互換性のためにまだサポートしています。
-
-古い形式を完全に無効にするために、環境変数 `ELECTRON_HIDE_INTERNAL_MODULES` を設定できます：
+もし`electron`モジュール全体が必要であれば、requireして、それぞれのモジュールを`electron`からアクセスすることができます。
 
 ```javascript
-process.env.ELECTRON_HIDE_INTERNAL_MODULES = 'true'
+const electron = require('electron');
+const {app, BrowserWindow} = electron;
 ```
 
-もしくは `hideInternalModules` API を呼んでください：
+これは、次のコードと同じ意味を持ちます。
 
 ```javascript
-require('electron').hideInternalModules()
+const electron = require('electron');
+const app = electron.app;
+const BrowserWindow = electron.BrowserWindow;
 ```
 
 [gui]: https://en.wikipedia.org/wiki/Graphical_user_interface
diff --git a/docs-translations/jp/tutorial/desktop-environment-integration.md b/docs-translations/jp/tutorial/desktop-environment-integration.md
index 96bf76d73709..6cd838afa7d7 100644
--- a/docs-translations/jp/tutorial/desktop-environment-integration.md
+++ b/docs-translations/jp/tutorial/desktop-environment-integration.md
@@ -8,14 +8,17 @@
 
 3つのオペレーティングシステム全てで、アプリケーションからユーザーに通知を送る手段が提供されています。通知を表示するためにオペレーティングシステムのネイティブ通知APIを使用しする[HTML5 Notification API](https://notifications.spec.whatwg.org/)で、Electronは、開発者に通知を送ることができます。
 
+**注意:** これはHTML5 APIですので、レンダラプロセス内のみで有効です。
+
+
 ```javascript
-var myNotification = new Notification('Title', {
+let myNotification = new Notification('Title', {
   body: 'Lorem Ipsum Dolor Sit Amet'
 });
 
-myNotification.onclick = function () {
-  console.log('Notification clicked')
-}
+myNotification.onclick = () => {
+  console.log('Notification clicked');
+};
 ```
 
 オペレーティングシステム間でコードとユーザ体験は似ていますが、細かい違いがあります。
@@ -88,8 +91,8 @@ const electron = require('electron');
 const app = electron.app;
 const Menu = electron.Menu;
 
-var dockMenu = Menu.buildFromTemplate([
-  { label: 'New Window', click: function() { console.log('New Window'); } },
+const dockMenu = Menu.buildFromTemplate([
+  { label: 'New Window', click() { console.log('New Window'); } },
   { label: 'New Window with Settings', submenu: [
     { label: 'Basic' },
     { label: 'Pro'}
@@ -153,24 +156,24 @@ __Windows Media Playerの縮小表示ツールバー:__
 アプリケーションに縮小表示ツールバーを設定するために、[BrowserWindow.setThumbarButtons][setthumbarbuttons]を使えます:
 
 ```javascript
-const BrowserWindow = require('electron').BrowserWindow;
+const {BrowserWindow} = require('electron');
 const path = require('path');
 
-var win = new BrowserWindow({
+let win = new BrowserWindow({
   width: 800,
   height: 600
 });
 win.setThumbarButtons([
   {
-    tooltip: "button1",
+    tooltip: 'button1',
     icon: path.join(__dirname, 'button1.png'),
-    click: function() { console.log("button2 clicked"); }
+    click() { console.log("button2 clicked"); }
   },
   {
-    tooltip: "button2",
+    tooltip: 'button2',
     icon: path.join(__dirname, 'button2.png'),
-    flags:['enabled', 'dismissonclick'],
-    click: function() { console.log("button2 clicked."); }
+    flags: ['enabled', 'dismissonclick'],
+    click() { console.log("button2 clicked."); }
   }
 ]);
 ```
@@ -189,25 +192,22 @@ __Audaciousのランチャーショートカット:__
 
 ![audacious](https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles?action=AttachFile&do=get&target=shortcuts.png)
 
-## タスクバーの進行状況バー (Windows & Unity)
+## タスクバーの進行状況バー (Windows, OS X, Unity)
 
 Windowsでは、タスクバーボタンは、進行状況バーを表示するのに使えます。ウィンドウを切り替えることなくウィンドウの進行状況情報をユーザーに提供することができます。
 
+OS Xではプログレスバーはドックアイコンの一部として表示されます。
 Unity DEは、ランチャーに進行状況バーの表示をするのと同様の機能を持っています。
 
 __タスクバーボタン上の進行状況バー:__
 
 ![Taskbar Progress Bar](https://cloud.githubusercontent.com/assets/639601/5081682/16691fda-6f0e-11e4-9676-49b6418f1264.png)
 
-__Unityランチャーでの進行状況バー:__
-
-![Unity Launcher](https://cloud.githubusercontent.com/assets/639601/5081747/4a0a589e-6f0f-11e4-803f-91594716a546.png)
-
 ウィンドウに進行状況バーを設定するために、[BrowserWindow.setProgressBar][setprogressbar] APIを使えます:
 
 ```javascript
-var window = new BrowserWindow({...});
-window.setProgressBar(0.5);
+let win = new BrowserWindow({...});
+win.setProgressBar(0.5);
 ```
 
 ## タスクバーでアイコンをオーバーレイする (Windows)
@@ -223,8 +223,8 @@ __タスクバーボタンでのオーバーレイ:__
 ウィンドウでオーバーレイアイコンを設定するために、[BrowserWindow.setOverlayIcon][setoverlayicon] APIを使用できます。
 
 ```javascript
-var window = new BrowserWindow({...});
-window.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
+let win = new BrowserWindow({...});
+win.setOverlayIcon('path/to/overlay.png', 'Description for overlay');
 ```
 
 ##  Windowのファイル表示 (OS X)
@@ -240,9 +240,9 @@ __Represented file ポップアップメニュー:__
 ウィンドウにrepresented fileを設定するために、[BrowserWindow.setRepresentedFilename][setrepresentedfilename] と [BrowserWindow.setDocumentEdited][setdocumentedited] APIsを使えます:
 
 ```javascript
-var window = new BrowserWindow({...});
-window.setRepresentedFilename('/etc/passwd');
-window.setDocumentEdited(true);
+let win = new BrowserWindow({...});
+win.setRepresentedFilename('/etc/passwd');
+win.setDocumentEdited(true);
 ```
 
 [addrecentdocument]: ../api/app.md#appaddrecentdocumentpath-os-x-windows
diff --git a/docs-translations/jp/tutorial/online-offline-events.md b/docs-translations/jp/tutorial/online-offline-events.md
index 92503b04dfcb..6e0cbfb55981 100644
--- a/docs-translations/jp/tutorial/online-offline-events.md
+++ b/docs-translations/jp/tutorial/online-offline-events.md
@@ -9,10 +9,11 @@ const electron = require('electron');
 const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 
-var onlineStatusWindow;
-app.on('ready', function() {
+let onlineStatusWindow;
+
+app.on('ready', () => {
   onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
-  onlineStatusWindow.loadURL('file://' + __dirname + '/online-status.html');
+  onlineStatusWindow.loadURL('file://${__dirname}/online-status.html');
 });
 ```
 
@@ -23,7 +24,7 @@ _online-status.html_
 <html>
 <body>
 <script>
-  var alertOnlineStatus = function() {
+  const alertOnlineStatus = () => {
     window.alert(navigator.onLine ? 'online' : 'offline');
   };
 
@@ -46,13 +47,14 @@ const app = electron.app;
 const ipcMain = electron.ipcMain;
 const BrowserWindow = electron.BrowserWindow;
 
-var onlineStatusWindow;
-app.on('ready', function() {
+let onlineStatusWindow;
+
+app.on('ready', () => {
   onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
-  onlineStatusWindow.loadURL('file://' + __dirname + '/online-status.html');
+  onlineStatusWindow.loadURL('file://${__dirname}/online-status.html');
 });
 
-ipcMain.on('online-status-changed', function(event, status) {
+ipcMain.on('online-status-changed', (event, status) => {
   console.log(status);
 });
 ```
@@ -64,8 +66,8 @@ _online-status.html_
 <html>
 <body>
 <script>
-  const ipcRenderer = require('electron').ipcRenderer;
-  var updateOnlineStatus = function() {
+  const {ipcRenderer} = require('electron');
+  const updateOnlineStatus = () => {
     ipcRenderer.send('online-status-changed', navigator.onLine ? 'online' : 'offline');
   };
 
diff --git a/docs-translations/jp/tutorial/quick-start.md b/docs-translations/jp/tutorial/quick-start.md
index 4a4a7f1692d5..8ee9c817d0d9 100644
--- a/docs-translations/jp/tutorial/quick-start.md
+++ b/docs-translations/jp/tutorial/quick-start.md
@@ -52,48 +52,60 @@ __注記__： `package.json` に `main` が存在しない場合、Electron は
 `main.js` ではウィンドウを作成してシステムイベントを管理します。典型的な例は次のようになります：
 
 ```javascript
-'use strict';
-
 const electron = require('electron');
-const app = electron.app;  // Module to control application life.
-const BrowserWindow = electron.BrowserWindow;  // Module to create native browser window.
+// アプリケーションを操作するモジュール
+const {app} = electron;
+// ネイティブブラウザウィンドウを作成するモジュール
+const {BrowserWindow} = electron;
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-var mainWindow = null;
+// ウィンドウオブジェクトをグローバル参照をしておくこと。
+// しないと、ガベージコレクタにより自動的に閉じられてしまう。
+let win;
 
-// Quit when all windows are closed.
-app.on('window-all-closed', function() {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform != 'darwin') {
+function createWindow() {
+  // ブラウザウィンドウの作成
+  win = new BrowserWindow({width: 800, height: 600});
+
+  // アプリケーションのindex.htmlの読み込み
+  win.loadURL(`file://${__dirname}/index.html`);
+
+  // DevToolsを開く
+  win.webContents.openDevTools();
+
+  // ウィンドウが閉じられた時に発行される
+  win.on('closed', () => {
+	// ウィンドウオブジェクトを参照から外す。
+	// もし何個かウィンドウがあるならば、配列として持っておいて、対応するウィンドウのオブジェクトを消去するべき。
+    win = null;
+  });
+}
+
+// このメソッドはElectronが初期化を終えて、ブラウザウィンドウを作成可能になった時に呼び出される。
+// 幾つかのAPIはこのイベントの後でしか使えない。
+app.on('ready', createWindow);
+
+// すべてのウィンドウが閉じられた時にアプリケーションを終了する。
+app.on('window-all-closed', () => {
+  // OS Xでは、Cmd + Q(終了)をユーザーが実行するまではウィンドウが全て閉じられても終了しないでおく。
+  if (process.platform !== 'darwin') {
     app.quit();
   }
 });
 
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-app.on('ready', function() {
-  // Create the browser window.
-  mainWindow = new BrowserWindow({width: 800, height: 600});
-
-  // and load the index.html of the app.
-  mainWindow.loadURL('file://' + __dirname + '/index.html');
-
-  // Open the DevTools.
-  mainWindow.webContents.openDevTools();
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function() {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null;
-  });
+app.on('activate', () => {
+  // OS X では、ドックをクリックされた時にウィンドウがなければ新しく作成する。
+  if (win === null) {
+    createWindow();
+  }
 });
+
+// In this file you can include the rest of your app's specific main process
+// code. You can also put them in separate files and require them here.
+// このファイルでアプリケーション固有のメインプロセスのコードを読み込むことができる。
+// ファイルを別に分けておいてここでrequireすることもできる。
 ```
 
-最後に表示するウェブページ `index.html` は次のようになります：
+最後に、表示するウェブページ `index.html` は次のようになります：
 
 ```html
 <!DOCTYPE html>
@@ -117,7 +129,9 @@ app.on('ready', function() {
 
 ### electron-prebuilt
 
-`electron-prebuilt` を `npm` でグローバルインストールしているなら、アプリのソースディレクトリ内で以下を実行するだけで済みます：
+[`electron-prebuilt`](https://github.com/electron-userland/electron-prebuilt)は、コンパイル済みのElectronを含んだ`npm`モジュールです。
+
+`npm`でグローバルインストールをしているなら、下記のコマンドをアプリケーションのソースディレクトリで実行するだけで済みます。
 
 ```bash
 electron .

From 9d02292dec9169a394e9a4007fd924a146b8267c Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Sun, 22 May 2016 00:22:51 +0900
Subject: [PATCH 316/510] Japanese manual: modified template string

modified based on the comments from Flatta
[ci skip]
---
 docs-translations/jp/tutorial/online-offline-events.md | 4 ++--
 docs-translations/jp/tutorial/quick-start.md           | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs-translations/jp/tutorial/online-offline-events.md b/docs-translations/jp/tutorial/online-offline-events.md
index 6e0cbfb55981..3b4f669c1f2d 100644
--- a/docs-translations/jp/tutorial/online-offline-events.md
+++ b/docs-translations/jp/tutorial/online-offline-events.md
@@ -13,7 +13,7 @@ let onlineStatusWindow;
 
 app.on('ready', () => {
   onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
-  onlineStatusWindow.loadURL('file://${__dirname}/online-status.html');
+  onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`);
 });
 ```
 
@@ -51,7 +51,7 @@ let onlineStatusWindow;
 
 app.on('ready', () => {
   onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false });
-  onlineStatusWindow.loadURL('file://${__dirname}/online-status.html');
+  onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`);
 });
 
 ipcMain.on('online-status-changed', (event, status) => {
diff --git a/docs-translations/jp/tutorial/quick-start.md b/docs-translations/jp/tutorial/quick-start.md
index 8ee9c817d0d9..f6c5e9679f80 100644
--- a/docs-translations/jp/tutorial/quick-start.md
+++ b/docs-translations/jp/tutorial/quick-start.md
@@ -99,8 +99,6 @@ app.on('activate', () => {
   }
 });
 
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
 // このファイルでアプリケーション固有のメインプロセスのコードを読み込むことができる。
 // ファイルを別に分けておいてここでrequireすることもできる。
 ```

From 3db2daf790b68c02c2a257375b19dff50acc7b15 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sat, 21 May 2016 23:38:50 +0530
Subject: [PATCH 317/510] browser: flags to control iwa enabled server
 whitelist

---
 atom/browser/api/atom_api_app.cc         |  8 --------
 atom/browser/api/atom_api_app.h          |  1 -
 atom/browser/atom_browser_context.cc     | 13 +------------
 atom/browser/atom_browser_context.h      |  5 -----
 docs/api/chrome-command-line-switches.md | 18 ++++++++++++++++++
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index d74dd671e903..53107738acec 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -375,12 +375,6 @@ void App::SetDesktopName(const std::string& desktop_name) {
 #endif
 }
 
-void App::AllowNTLMCredentialsForAllDomains(bool should_allow) {
-  auto browser_context = static_cast<AtomBrowserContext*>(
-        AtomBrowserMainParts::Get()->browser_context());
-  browser_context->AllowNTLMCredentialsForAllDomains(should_allow);
-}
-
 std::string App::GetLocale() {
   return l10n_util::GetApplicationLocale("");
 }
@@ -482,8 +476,6 @@ void App::BuildPrototype(
       .SetMethod("setPath", &App::SetPath)
       .SetMethod("getPath", &App::GetPath)
       .SetMethod("setDesktopName", &App::SetDesktopName)
-      .SetMethod("allowNTLMCredentialsForAllDomains",
-                 &App::AllowNTLMCredentialsForAllDomains)
       .SetMethod("getLocale", &App::GetLocale)
 #if defined(USE_NSS_CERTS)
       .SetMethod("importCertificate", &App::ImportCertificate)
diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index edfd09c4d289..5dd07054a07b 100644
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -106,7 +106,6 @@ class App : public AtomBrowserClient::Delegate,
                const base::FilePath& path);
 
   void SetDesktopName(const std::string& desktop_name);
-  void AllowNTLMCredentialsForAllDomains(bool should_allow);
   bool MakeSingleInstance(
       const ProcessSingleton::NotificationCallback& callback);
   std::string GetLocale();
diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
index 04d5134a49e9..25aff9dbc87d 100644
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -67,8 +67,7 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition,
     : brightray::BrowserContext(partition, in_memory),
       cert_verifier_(new AtomCertVerifier),
       job_factory_(new AtomURLRequestJobFactory),
-      network_delegate_(new AtomNetworkDelegate),
-      allow_ntlm_everywhere_(false) {
+      network_delegate_(new AtomNetworkDelegate) {
 }
 
 AtomBrowserContext::~AtomBrowserContext() {
@@ -195,16 +194,6 @@ void AtomBrowserContext::RegisterPrefs(PrefRegistrySimple* pref_registry) {
   pref_registry->RegisterDictionaryPref(prefs::kDevToolsFileSystemPaths);
 }
 
-bool AtomBrowserContext::AllowNTLMCredentialsForDomain(const GURL& origin) {
-  if (allow_ntlm_everywhere_)
-    return true;
-  return Delegate::AllowNTLMCredentialsForDomain(origin);
-}
-
-void AtomBrowserContext::AllowNTLMCredentialsForAllDomains(bool should_allow) {
-  allow_ntlm_everywhere_ = should_allow;
-}
-
 }  // namespace atom
 
 namespace brightray {
diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h
index d959adbc753a..4e206a3f00ea 100644
--- a/atom/browser/atom_browser_context.h
+++ b/atom/browser/atom_browser_context.h
@@ -33,7 +33,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
       const base::FilePath& base_path) override;
   scoped_ptr<net::CertVerifier> CreateCertVerifier() override;
   net::SSLConfigService* CreateSSLConfigService() override;
-  bool AllowNTLMCredentialsForDomain(const GURL& auth_origin) override;
 
   // content::BrowserContext:
   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
@@ -43,8 +42,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
   // brightray::BrowserContext:
   void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
 
-  void AllowNTLMCredentialsForAllDomains(bool should_allow);
-
   AtomCertVerifier* cert_verifier() const { return cert_verifier_; }
 
   AtomURLRequestJobFactory* job_factory() const { return job_factory_; }
@@ -61,8 +58,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
   AtomURLRequestJobFactory* job_factory_;
   AtomNetworkDelegate* network_delegate_;
 
-  bool allow_ntlm_everywhere_;
-
   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
 };
 
diff --git a/docs/api/chrome-command-line-switches.md b/docs/api/chrome-command-line-switches.md
index bd16c00b0976..4fe6d136da2b 100644
--- a/docs/api/chrome-command-line-switches.md
+++ b/docs/api/chrome-command-line-switches.md
@@ -95,6 +95,24 @@ connection, and the endpoint host in a `SOCKS` proxy connection).
 
 Like `--host-rules` but these `rules` only apply to the host resolver.
 
+## --auth-server-whitelist=`url`
+
+A comma-separated list of servers for which integrated authentication is enabled.
+
+For example:
+
+```
+--auth-server-whitelist='*example.com, *foobar.com, *baz'
+```
+
+then any `url` ending with `example.com`, `foobar.com`, `baz` will be considered
+for integrated authentication. Without `*` prefix the url has to match exactly.
+
+## --auth-negotiate-delegate-whitelist=`url`
+
+A comma-separated list of servers for which delegation of user credentials is required.
+Without `*` prefix the url has to match exactly.
+
 ## --ignore-certificate-errors
 
 Ignores certificate related errors.

From 48b161f210501543befbacda1b1c727c570febad Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 22 May 2016 18:30:14 +0900
Subject: [PATCH 318/510] Update crashpad to 35da3b6

---
 atom/common/crash_reporter/crash_reporter_mac.mm | 6 ++++--
 vendor/crashpad                                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/atom/common/crash_reporter/crash_reporter_mac.mm b/atom/common/crash_reporter/crash_reporter_mac.mm
index 130a421665f7..ee2ce036048f 100644
--- a/atom/common/crash_reporter/crash_reporter_mac.mm
+++ b/atom/common/crash_reporter/crash_reporter_mac.mm
@@ -4,6 +4,8 @@
 
 #include "atom/common/crash_reporter/crash_reporter_mac.h"
 
+#include <memory>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/mac/bundle_locations.h"
@@ -73,7 +75,7 @@ void CrashReporterMac::InitBreakpad(const std::string& product_name,
     SetCrashKeyValue(upload_parameter.first, upload_parameter.second);
   }
   if (is_browser_) {
-    scoped_ptr<crashpad::CrashReportDatabase> database =
+    std::unique_ptr<crashpad::CrashReportDatabase> database =
         crashpad::CrashReportDatabase::Initialize(database_path);
     if (database) {
       database->GetSettings()->SetUploadsEnabled(auto_submit);
@@ -99,7 +101,7 @@ CrashReporterMac::GetUploadedReports(const std::string& path) {
     return uploaded_reports;
   }
   // Load crashpad database.
-  scoped_ptr<crashpad::CrashReportDatabase> database =
+  std::unique_ptr<crashpad::CrashReportDatabase> database =
     crashpad::CrashReportDatabase::Initialize(file_path);
   DCHECK(database);
 
diff --git a/vendor/crashpad b/vendor/crashpad
index e2073935d7c6..51f78aefa872 160000
--- a/vendor/crashpad
+++ b/vendor/crashpad
@@ -1 +1 @@
-Subproject commit e2073935d7c674f4a9e7fced821f611c5b13f07b
+Subproject commit 51f78aefa872211022ae2d44260cbfd07a6aeb6a

From 4c531e909b175e087f0b3adc6d2f46ce614dc228 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 22 May 2016 21:56:39 +0900
Subject: [PATCH 319/510] Update breakpad to lastest master

---
 atom/common/crash_reporter/win/crash_service.cc | 4 +++-
 vendor/breakpad                                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/atom/common/crash_reporter/win/crash_service.cc b/atom/common/crash_reporter/win/crash_service.cc
index b3499bc09540..4563a9202a3e 100644
--- a/atom/common/crash_reporter/win/crash_service.cc
+++ b/atom/common/crash_reporter/win/crash_service.cc
@@ -440,10 +440,12 @@ DWORD CrashService::AsyncSendDump(void* context) {
       // termination of the service object.
       base::AutoLock lock(info->self->sending_);
       VLOG(1) << "trying to send report for pid = " << info->pid;
+      std::map<std::wstring, std::wstring> file_map;
+      file_map[L"upload_file_minidump"] = info->dump_path;
       google_breakpad::ReportResult send_result
           = info->self->sender_->SendCrashReport(info->self->reporter_url_,
                                                  info->map,
-                                                 info->dump_path,
+                                                 file_map,
                                                  &report_id);
       switch (send_result) {
         case google_breakpad::RESULT_FAILED:
diff --git a/vendor/breakpad b/vendor/breakpad
index 4ee7e1a703d0..c566c50d81f7 160000
--- a/vendor/breakpad
+++ b/vendor/breakpad
@@ -1 +1 @@
-Subproject commit 4ee7e1a703d066861b7bf6fce28526f8ed07dcd6
+Subproject commit c566c50d81f7b1edeaee9f11f5d07bda858d6b64

From 62cad610e0dd722d25bb2b563927d97b874587b1 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Mon, 23 May 2016 01:52:09 +0530
Subject: [PATCH 320/510] bring back app.allowNTLMCredentialsForAllDomains

---
 docs/api/app.md        | 6 +++---
 lib/browser/api/app.js | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index f00b498d30c3..fdc5cc9b72e4 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -443,9 +443,7 @@ Adds `tasks` to the [Tasks][tasks] category of the JumpList on Windows.
   consists of two or more icons, set this value to identify the icon. If an
   icon file consists of one icon, this value is 0.
 
-### `app.allowNTLMCredentialsForAllDomains(allow)`
-
-* `allow` Boolean
+### `app.allowNTLMCredentialsForAllDomains()`
 
 Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate
 authentication - normally, Electron will only send NTLM/Kerberos credentials for
@@ -453,6 +451,8 @@ URLs that fall under "Local Intranet" sites (i.e. are in the same domain as you)
 However, this detection often fails when corporate networks are badly configured,
 so this lets you co-opt this behavior and enable it for all URLs.
 
+**Note:** This method should be called before the `ready` event gets emitted.
+
 ### `app.makeSingleInstance(callback)`
 
 * `callback` Function
diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 66ee0ac1e458..38b465688cfc 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -22,6 +22,9 @@ Object.assign(app, {
   commandLine: {
     appendSwitch: bindings.appendSwitch,
     appendArgument: bindings.appendArgument
+  },
+  allowNTLMCredentialsForAllDomains () {
+    this.commandLine.appendSwitch('auth-server-whitelist', '*')
   }
 })
 

From 8f7a04f9c3dbc70fa1f8854398fc1aaef1bf52c4 Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Sun, 22 May 2016 15:43:47 -0700
Subject: [PATCH 321/510] =?UTF-8?q?=F0=9F=8D=8E=20=20let=20Cocoa=20handle?=
 =?UTF-8?q?=20keeping=20the=20aspect=20ratio=20whenever=20the=20edges=20ar?=
 =?UTF-8?q?e=20dragged?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 atom/browser/native_window_mac.mm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index bfffc7a08d64..434919dde117 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -141,22 +141,11 @@ bool ScopedDisableResize::disable_resize_ = false;
     newSize.width =
         roundf((frameSize.height - extraHeightPlusFrame) * aspectRatio +
                extraWidthPlusFrame);
+    newSize.height =
+        roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
+               extraHeightPlusFrame);
 
-    // If the new width is less than the frame size use it as the primary
-    // constraint. This ensures that the value returned by this method will
-    // never be larger than the users requested window size.
-    if (newSize.width <= frameSize.width) {
-      newSize.height =
-          roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
-                 extraHeightPlusFrame);
-    } else {
-      newSize.height =
-          roundf((frameSize.width - extraWidthPlusFrame) / aspectRatio +
-                 extraHeightPlusFrame);
-      newSize.width =
-          roundf((newSize.height - extraHeightPlusFrame) * aspectRatio +
-                 extraWidthPlusFrame);
-    }
+    [sender setAspectRatio:NSMakeSize(newSize.width, newSize.height)];
   }
 
   return newSize;

From 7aaf97436218fb93988e658d83dd6394bfad52ab Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Sun, 22 May 2016 16:50:50 -0700
Subject: [PATCH 322/510] override SetAspectRatio for NativeWindowMac

---
 atom/browser/native_window.h      |  2 +-
 atom/browser/native_window_mac.h  |  2 ++
 atom/browser/native_window_mac.mm | 23 +++++++++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 7317a7ba6f76..8776e3d00652 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -190,7 +190,7 @@ class NativeWindow : public base::SupportsUserData,
   // Set the aspect ratio when resizing window.
   double GetAspectRatio();
   gfx::Size GetAspectRatioExtraSize();
-  void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
+  virtual void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
 
   base::WeakPtr<NativeWindow> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index cfb3141ede66..c1694c3c784a 100644
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -49,6 +49,8 @@ class NativeWindowMac : public NativeWindow {
   void SetResizable(bool resizable) override;
   bool IsResizable() override;
   void SetMovable(bool movable) override;
+  void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size)
+    override;
   bool IsMovable() override;
   void SetMinimizable(bool minimizable) override;
   bool IsMinimizable() override;
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 434919dde117..f7cd4d42281e 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -144,8 +144,6 @@ bool ScopedDisableResize::disable_resize_ = false;
     newSize.height =
         roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
                extraHeightPlusFrame);
-
-    [sender setAspectRatio:NSMakeSize(newSize.width, newSize.height)];
   }
 
   return newSize;
@@ -708,6 +706,27 @@ bool NativeWindowMac::IsResizable() {
   return [window_ styleMask] & NSResizableWindowMask;
 }
 
+void NativeWindowMac::SetAspectRatio(double aspect_ratio,
+    const gfx::Size& extra_size) {
+
+    gfx::Size windowSize = this->GetSize();
+    gfx::Size contentSize = this->GetContentSize();
+
+    double extraWidthPlusFrame =
+        windowSize.width() - contentSize.width() + extra_size.width();
+    double extraHeightPlusFrame =
+        windowSize.height() - contentSize.height() + extra_size.height();
+
+    double width =
+        roundf(([window_ frame].size.height - extraHeightPlusFrame) *
+        aspect_ratio + extraWidthPlusFrame);
+    double height =
+        roundf((width - extraWidthPlusFrame) /
+        aspect_ratio + extraHeightPlusFrame);
+
+    [window_ setAspectRatio:NSMakeSize(width, height)];
+}
+
 void NativeWindowMac::SetMovable(bool movable) {
   [window_ setMovable:movable];
 }

From 13b4c8bb061121f46b34b5059106babc484ee20b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 08:59:34 +0900
Subject: [PATCH 323/510] Ignore invalid parameter error in crash service
 process

---
 atom/common/crash_reporter/win/crash_service_main.cc | 8 ++++++++
 spec/api-crash-reporter-spec.js                      | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/atom/common/crash_reporter/win/crash_service_main.cc b/atom/common/crash_reporter/win/crash_service_main.cc
index 56d46970b67f..c6325f090ade 100644
--- a/atom/common/crash_reporter/win/crash_service_main.cc
+++ b/atom/common/crash_reporter/win/crash_service_main.cc
@@ -20,6 +20,11 @@ const char kApplicationName[] = "application-name";
 const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
 const wchar_t kStandardLogFile[] = L"operation_log.txt";
 
+void InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*,
+                             unsigned int, uintptr_t) {
+  // noop.
+}
+
 bool GetCrashServiceDirectory(const std::wstring& application_name,
                               base::FilePath* dir) {
   base::FilePath temp_dir;
@@ -37,6 +42,9 @@ bool GetCrashServiceDirectory(const std::wstring& application_name,
 }  // namespace.
 
 int Main(const wchar_t* cmd) {
+  // Ignore invalid parameter errors.
+  _set_invalid_parameter_handler(InvalidParameterHandler);
+
   // Initialize all Chromium things.
   base::AtExitManager exit_manager;
   base::CommandLine::Init(0, NULL);
diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
index f262f6fc834a..b4f63fe1ef27 100644
--- a/spec/api-crash-reporter-spec.js
+++ b/spec/api-crash-reporter-spec.js
@@ -23,11 +23,6 @@ describe('crash-reporter module', function () {
     w.destroy()
   })
 
-  // It is not working on 64bit Windows.
-  if (process.platform === 'win32' && process.arch === 'x64') {
-    return
-  }
-
   if (process.mas) {
     return
   }

From ac6e4aff5e4dbb2b91ed8c6e17c4a3c5bd9165a7 Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Sun, 22 May 2016 17:00:14 -0700
Subject: [PATCH 324/510] comments

---
 atom/browser/native_window_mac.mm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index f7cd4d42281e..264cab5fe739 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -709,6 +709,11 @@ bool NativeWindowMac::IsResizable() {
 void NativeWindowMac::SetAspectRatio(double aspect_ratio,
     const gfx::Size& extra_size) {
 
+    // We can't just pass the aspect ratio to Cocoa, since our API receives
+    // it as a float, and Cocoa expects an NSRect with explicit width & height
+    // arguments. Instead we derive those args ourselves from the given aspect
+    // ratio.
+    
     gfx::Size windowSize = this->GetSize();
     gfx::Size contentSize = this->GetContentSize();
 

From 09de0c2766b3c8e4340f1f6f14bfb4e80faf866a Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Sun, 22 May 2016 17:22:57 -0700
Subject: [PATCH 325/510] call base SetAspectRatio in NativeWindowMac
 implementation

---
 atom/browser/native_window_mac.mm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 264cab5fe739..3bd3ed1b995a 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -708,12 +708,13 @@ bool NativeWindowMac::IsResizable() {
 
 void NativeWindowMac::SetAspectRatio(double aspect_ratio,
     const gfx::Size& extra_size) {
+    NativeWindow::SetAspectRatio(aspect_ratio, extra_size);
 
     // We can't just pass the aspect ratio to Cocoa, since our API receives
     // it as a float, and Cocoa expects an NSRect with explicit width & height
     // arguments. Instead we derive those args ourselves from the given aspect
     // ratio.
-    
+
     gfx::Size windowSize = this->GetSize();
     gfx::Size contentSize = this->GetContentSize();
 

From 05c2999651b34021e09b932b01e63f2849c7ee57 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 22 May 2016 18:06:48 +0900
Subject: [PATCH 326/510] Update to Chrome 51.0.2704.54

---
 atom/common/chrome_version.h | 2 +-
 script/lib/config.py         | 2 +-
 vendor/brightray             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h
index d7f46761287e..3abf4d4252c7 100644
--- a/atom/common/chrome_version.h
+++ b/atom/common/chrome_version.h
@@ -8,7 +8,7 @@
 #ifndef ATOM_COMMON_CHROME_VERSION_H_
 #define ATOM_COMMON_CHROME_VERSION_H_
 
-#define CHROME_VERSION_STRING "50.0.2661.102"
+#define CHROME_VERSION_STRING "51.0.2704.54"
 #define CHROME_VERSION "v" CHROME_VERSION_STRING
 
 #endif  // ATOM_COMMON_CHROME_VERSION_H_
diff --git a/script/lib/config.py b/script/lib/config.py
index 01bde92deab6..8ea5bf1e6059 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = 'afdc76a15e66a6a3aeefdc047b34c99eec7f5611'
+LIBCHROMIUMCONTENT_COMMIT = '31ff4384348b139d9e138d4df41b85a11d1a4dbb'
 
 PLATFORM = {
   'cygwin': 'win32',
diff --git a/vendor/brightray b/vendor/brightray
index 5c0307a81008..477290bfa105 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 5c0307a810088a112d44a452a29baaaa36cd9b42
+Subproject commit 477290bfa105053719a2de5f42089eb8ba261713

From 1d61f987cb694232ec4c12190da4530f7aec9baf Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Sun, 22 May 2016 18:36:05 -0700
Subject: [PATCH 327/510] code styling

---
 atom/browser/native_window_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 3bd3ed1b995a..0f52adf30b6d 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -707,7 +707,7 @@ bool NativeWindowMac::IsResizable() {
 }
 
 void NativeWindowMac::SetAspectRatio(double aspect_ratio,
-    const gfx::Size& extra_size) {
+                                     const gfx::Size& extra_size) {
     NativeWindow::SetAspectRatio(aspect_ratio, extra_size);
 
     // We can't just pass the aspect ratio to Cocoa, since our API receives

From 7ba391da7cb8a8edf688a0eee638167787ab80fd Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 10:59:39 +0900
Subject: [PATCH 328/510] Update to API changes of Chrome 51

---
 atom/app/atom_main_delegate.cc                |  8 ++++----
 atom/app/atom_main_delegate.h                 |  8 ++++----
 atom/browser/api/atom_api_app.cc              | 10 +++++-----
 atom/browser/api/atom_api_app.h               | 10 +++++-----
 atom/browser/api/atom_api_cookies.cc          | 14 ++++++-------
 atom/browser/api/atom_api_debugger.cc         |  2 +-
 atom/browser/api/atom_api_desktop_capturer.cc |  4 ++--
 atom/browser/api/atom_api_desktop_capturer.h  |  2 +-
 atom/browser/api/atom_api_menu.h              |  2 +-
 .../api/atom_api_power_save_blocker.cc        |  2 +-
 .../browser/api/atom_api_power_save_blocker.h |  2 +-
 atom/browser/api/atom_api_protocol.h          |  6 +++---
 atom/browser/api/atom_api_session.cc          |  4 ++--
 .../api/atom_api_system_preferences_mac.mm    |  2 +-
 atom/browser/api/atom_api_tray.h              |  2 +-
 atom/browser/api/atom_api_web_contents.cc     |  4 ++--
 atom/browser/api/atom_api_web_contents.h      |  2 +-
 atom/browser/api/atom_api_window.h            |  2 +-
 atom/browser/api/trackable_object.h           |  4 ++--
 atom/browser/atom_browser_client.cc           |  2 +-
 atom/browser/atom_browser_client.h            |  4 ++--
 atom/browser/atom_browser_context.cc          | 10 +++++-----
 atom/browser/atom_browser_context.h           | 10 +++++-----
 atom/browser/atom_browser_main_parts.h        | 12 +++++------
 .../browser/atom_javascript_dialog_manager.cc |  7 ++-----
 atom/browser/atom_javascript_dialog_manager.h |  2 --
 atom/browser/atom_permission_manager.cc       | 18 ++++++++---------
 atom/browser/atom_permission_manager.h        | 11 +++++-----
 .../atom_security_state_model_client.h        |  2 +-
 atom/browser/browser_win.cc                   |  4 ++--
 atom/browser/common_web_contents_delegate.cc  |  2 +-
 atom/browser/common_web_contents_delegate.h   |  6 +++---
 atom/browser/mac/atom_application_delegate.mm |  2 +-
 atom/browser/mac/dict_util.h                  |  2 +-
 atom/browser/mac/dict_util.mm                 | 16 +++++++--------
 atom/browser/native_window.cc                 |  4 ++--
 atom/browser/native_window.h                  |  4 ++--
 atom/browser/native_window_mac.mm             |  4 ++--
 atom/browser/native_window_views.h            | 10 +++++-----
 atom/browser/net/asar/url_request_asar_job.h  |  2 +-
 atom/browser/net/atom_cert_verifier.cc        |  2 +-
 atom/browser/net/atom_cert_verifier.h         |  4 ++--
 atom/browser/net/atom_network_delegate.cc     | 20 +++++++++----------
 atom/browser/net/atom_network_delegate.h      |  2 +-
 .../net/atom_url_request_job_factory.cc       |  6 +++---
 .../net/atom_url_request_job_factory.h        |  6 +++---
 atom/browser/net/js_asker.cc                  |  2 +-
 atom/browser/net/js_asker.h                   |  6 +++---
 .../browser/net/url_request_async_asar_job.cc |  2 +-
 atom/browser/net/url_request_async_asar_job.h |  2 +-
 atom/browser/net/url_request_buffer_job.cc    |  2 +-
 atom/browser/net/url_request_buffer_job.h     |  2 +-
 atom/browser/net/url_request_fetch_job.cc     |  2 +-
 atom/browser/net/url_request_fetch_job.h      |  6 +++---
 atom/browser/net/url_request_string_job.cc    |  2 +-
 atom/browser/net/url_request_string_job.h     |  2 +-
 atom/browser/node_debugger.cc                 |  2 +-
 atom/browser/node_debugger.h                  |  6 +++---
 atom/browser/ui/accelerator_util_mac.mm       |  2 +-
 atom/browser/ui/file_dialog_gtk.cc            |  2 +-
 atom/browser/ui/file_dialog_win.cc            |  4 ++--
 atom/browser/ui/message_box_win.cc            |  2 +-
 atom/browser/ui/tray_icon_gtk.h               |  2 +-
 atom/browser/ui/views/menu_delegate.h         |  4 ++--
 atom/browser/ui/x/x_window_utils.cc           |  4 ++--
 atom/browser/web_view_guest_delegate.h        |  8 ++++----
 atom/common/api/atom_api_asar.cc              |  6 +++---
 atom/common/api/atom_api_native_image.cc      |  4 ++--
 atom/common/api/event_emitter_caller.cc       |  2 +-
 atom/common/api/locker.h                      |  6 ++++--
 atom/common/asar/archive.cc                   |  4 ++--
 atom/common/asar/archive.h                    |  4 ++--
 .../crash_reporter/crash_reporter_linux.h     |  2 +-
 .../crash_reporter/crash_reporter_mac.h       |  2 +-
 .../crash_reporter/crash_reporter_win.h       |  2 +-
 atom/common/native_mate_converters/callback.h | 19 +++++++++++-------
 .../content_converter.cc                      |  8 ++++----
 .../content_converter.h                       |  6 +++---
 .../native_mate_converters/net_converter.cc   | 10 +++++-----
 .../v8_value_converter.cc                     |  8 ++++----
 .../native_mate_converters/value_converter.cc | 12 +++++------
 atom/common/node_bindings.cc                  | 10 +++++-----
 atom/renderer/api/atom_api_web_frame.cc       |  2 +-
 atom/renderer/api/atom_api_web_frame.h        |  2 +-
 atom/renderer/atom_renderer_client.cc         |  6 +-----
 atom/renderer/atom_renderer_client.h          | 11 +++-------
 vendor/brightray                              |  2 +-
 87 files changed, 225 insertions(+), 231 deletions(-)

diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
index 655ccce2e35b..82337dc5f6a6 100644
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -61,7 +61,7 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 #endif  // !defined(OS_WIN)
 
   // Only enable logging when --enable-logging is specified.
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
   if (!command_line->HasSwitch(switches::kEnableLogging) &&
       !env->HasVar("ELECTRON_ENABLE_LOGGING")) {
     settings.logging_dest = logging::LOG_NONE;
@@ -94,7 +94,7 @@ void AtomMainDelegate::PreSandboxStartup() {
   brightray::MainDelegate::PreSandboxStartup();
 
   // Set google API key.
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
   if (!env->HasVar("GOOGLE_API_KEY"))
     env->SetVar("GOOGLE_API_KEY", GOOGLEAPIS_API_KEY);
 
@@ -134,8 +134,8 @@ content::ContentUtilityClient* AtomMainDelegate::CreateContentUtilityClient() {
   return utility_client_.get();
 }
 
-scoped_ptr<brightray::ContentClient> AtomMainDelegate::CreateContentClient() {
-  return scoped_ptr<brightray::ContentClient>(new AtomContentClient);
+std::unique_ptr<brightray::ContentClient> AtomMainDelegate::CreateContentClient() {
+  return std::unique_ptr<brightray::ContentClient>(new AtomContentClient);
 }
 
 }  // namespace atom
diff --git a/atom/app/atom_main_delegate.h b/atom/app/atom_main_delegate.h
index 8f2976a9cd1b..2f9474cff563 100644
--- a/atom/app/atom_main_delegate.h
+++ b/atom/app/atom_main_delegate.h
@@ -24,7 +24,7 @@ class AtomMainDelegate : public brightray::MainDelegate {
   content::ContentUtilityClient* CreateContentUtilityClient() override;
 
   // brightray::MainDelegate:
-  scoped_ptr<brightray::ContentClient> CreateContentClient() override;
+  std::unique_ptr<brightray::ContentClient> CreateContentClient() override;
 #if defined(OS_MACOSX)
   void OverrideChildProcessPath() override;
   void OverrideFrameworkBundlePath() override;
@@ -36,9 +36,9 @@ class AtomMainDelegate : public brightray::MainDelegate {
 #endif
 
   brightray::ContentClient content_client_;
-  scoped_ptr<content::ContentBrowserClient> browser_client_;
-  scoped_ptr<content::ContentRendererClient> renderer_client_;
-  scoped_ptr<content::ContentUtilityClient> utility_client_;
+  std::unique_ptr<content::ContentBrowserClient> browser_client_;
+  std::unique_ptr<content::ContentRendererClient> renderer_client_;
+  std::unique_ptr<content::ContentUtilityClient> utility_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomMainDelegate);
 };
diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index d74dd671e903..b4c0fb6f217e 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -319,7 +319,7 @@ void App::AllowCertificateError(
 void App::SelectClientCertificate(
     content::WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
-    scoped_ptr<content::ClientCertificateDelegate> delegate) {
+    std::unique_ptr<content::ClientCertificateDelegate> delegate) {
   std::shared_ptr<content::ClientCertificateDelegate>
       shared_delegate(delegate.release());
   bool prevent_default =
@@ -370,7 +370,7 @@ void App::SetPath(mate::Arguments* args,
 
 void App::SetDesktopName(const std::string& desktop_name) {
 #if defined(OS_LINUX)
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
   env->SetVar("CHROME_DESKTOP", desktop_name);
 #endif
 }
@@ -413,7 +413,7 @@ void App::ImportCertificate(
     const net::CompletionCallback& callback) {
   auto browser_context = AtomBrowserMainParts::Get()->browser_context();
   if (!certificate_manager_model_) {
-    scoped_ptr<base::DictionaryValue> copy = options.CreateDeepCopy();
+    std::unique_ptr<base::DictionaryValue> copy = options.CreateDeepCopy();
     CertificateManagerModel::Create(browser_context,
         base::Bind(&App::OnCertificateManagerModelCreated,
                    base::Unretained(this),
@@ -427,9 +427,9 @@ void App::ImportCertificate(
 }
 
 void App::OnCertificateManagerModelCreated(
-    scoped_ptr<base::DictionaryValue> options,
+    std::unique_ptr<base::DictionaryValue> options,
     const net::CompletionCallback& callback,
-    scoped_ptr<CertificateManagerModel> model) {
+    std::unique_ptr<CertificateManagerModel> model) {
   certificate_manager_model_ = std::move(model);
   int rv = ImportIntoCertStore(certificate_manager_model_.get(),
                                *(options.get()));
diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index edfd09c4d289..1c6406c54ba4 100644
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -51,9 +51,9 @@ class App : public AtomBrowserClient::Delegate,
 
 #if defined(USE_NSS_CERTS)
   void OnCertificateManagerModelCreated(
-      scoped_ptr<base::DictionaryValue> options,
+      std::unique_ptr<base::DictionaryValue> options,
       const net::CompletionCallback& callback,
-      scoped_ptr<CertificateManagerModel> model);
+      std::unique_ptr<CertificateManagerModel> model);
 #endif
 
  protected:
@@ -93,7 +93,7 @@ class App : public AtomBrowserClient::Delegate,
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
-      scoped_ptr<content::ClientCertificateDelegate> delegate) override;
+      std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
 
   // content::GpuDataManagerObserver:
   void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
@@ -116,10 +116,10 @@ class App : public AtomBrowserClient::Delegate,
                          const net::CompletionCallback& callback);
 #endif
 
-  scoped_ptr<ProcessSingleton> process_singleton_;
+  std::unique_ptr<ProcessSingleton> process_singleton_;
 
 #if defined(USE_NSS_CERTS)
-  scoped_ptr<CertificateManagerModel> certificate_manager_model_;
+  std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(App);
diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc
index 22c57c97d6cf..6ee15a6cba90 100644
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -112,7 +112,7 @@ void RunCallbackInUI(const base::Closure& callback) {
 }
 
 // Remove cookies from |list| not matching |filter|, and pass it to |callback|.
-void FilterCookies(scoped_ptr<base::DictionaryValue> filter,
+void FilterCookies(std::unique_ptr<base::DictionaryValue> filter,
                    const Cookies::GetCallback& callback,
                    const net::CookieList& list) {
   net::CookieList result;
@@ -125,7 +125,7 @@ void FilterCookies(scoped_ptr<base::DictionaryValue> filter,
 
 // Receives cookies matching |filter| in IO thread.
 void GetCookiesOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                    scoped_ptr<base::DictionaryValue> filter,
+                    std::unique_ptr<base::DictionaryValue> filter,
                     const Cookies::GetCallback& callback) {
   std::string url;
   filter->GetString("url", &url);
@@ -157,7 +157,7 @@ void OnSetCookie(const Cookies::SetCallback& callback, bool success) {
 
 // Sets cookie with |details| in IO thread.
 void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
-                   scoped_ptr<base::DictionaryValue> details,
+                   std::unique_ptr<base::DictionaryValue> details,
                    const Cookies::SetCallback& callback) {
   std::string url, name, value, domain, path;
   bool secure = false;
@@ -197,8 +197,8 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
   GetCookieStore(getter)->SetCookieWithDetailsAsync(
       GURL(url), name, value, domain, path, creation_time,
       expiration_time, last_access_time, secure, http_only,
-      false, false, net::COOKIE_PRIORITY_DEFAULT,
-      base::Bind(OnSetCookie, callback));
+      net::CookieSameSite::DEFAULT_MODE, false,
+      net::COOKIE_PRIORITY_DEFAULT, base::Bind(OnSetCookie, callback));
 }
 
 }  // namespace
@@ -214,7 +214,7 @@ Cookies::~Cookies() {
 
 void Cookies::Get(const base::DictionaryValue& filter,
                   const GetCallback& callback) {
-  scoped_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
+  std::unique_ptr<base::DictionaryValue> copied(filter.CreateDeepCopy());
   auto getter = make_scoped_refptr(request_context_getter_);
   content::BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ -231,7 +231,7 @@ void Cookies::Remove(const GURL& url, const std::string& name,
 
 void Cookies::Set(const base::DictionaryValue& details,
                   const SetCallback& callback) {
-  scoped_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
+  std::unique_ptr<base::DictionaryValue> copied(details.CreateDeepCopy());
   auto getter = make_scoped_refptr(request_context_getter_);
   content::BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
diff --git a/atom/browser/api/atom_api_debugger.cc b/atom/browser/api/atom_api_debugger.cc
index 03490360133a..48b7a6f70c0b 100644
--- a/atom/browser/api/atom_api_debugger.cc
+++ b/atom/browser/api/atom_api_debugger.cc
@@ -52,7 +52,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
                                        const std::string& message) {
   DCHECK(agent_host == agent_host_.get());
 
-  scoped_ptr<base::Value> parsed_message(base::JSONReader::Read(message));
+  std::unique_ptr<base::Value> parsed_message(base::JSONReader::Read(message));
   if (!parsed_message->IsType(base::Value::TYPE_DICTIONARY))
     return;
 
diff --git a/atom/browser/api/atom_api_desktop_capturer.cc b/atom/browser/api/atom_api_desktop_capturer.cc
index 9200a89224c2..3cb29a9124d3 100644
--- a/atom/browser/api/atom_api_desktop_capturer.cc
+++ b/atom/browser/api/atom_api_desktop_capturer.cc
@@ -61,9 +61,9 @@ void DesktopCapturer::StartHandling(bool capture_window,
   options.set_disable_effects(false);
 #endif
 
-  scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
+  std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
       capture_screen ? webrtc::ScreenCapturer::Create(options) : nullptr);
-  scoped_ptr<webrtc::WindowCapturer> window_capturer(
+  std::unique_ptr<webrtc::WindowCapturer> window_capturer(
       capture_window ? webrtc::WindowCapturer::Create(options) : nullptr);
   media_list_.reset(new NativeDesktopMediaList(
       std::move(screen_capturer), std::move(window_capturer)));
diff --git a/atom/browser/api/atom_api_desktop_capturer.h b/atom/browser/api/atom_api_desktop_capturer.h
index e71141fa5218..4d1755e06827 100644
--- a/atom/browser/api/atom_api_desktop_capturer.h
+++ b/atom/browser/api/atom_api_desktop_capturer.h
@@ -39,7 +39,7 @@ class DesktopCapturer: public mate::EventEmitter<DesktopCapturer>,
   bool OnRefreshFinished() override;
 
  private:
-  scoped_ptr<DesktopMediaList> media_list_;
+  std::unique_ptr<DesktopMediaList> media_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopCapturer);
 };
diff --git a/atom/browser/api/atom_api_menu.h b/atom/browser/api/atom_api_menu.h
index 5701985ab101..9ba4d7a754c4 100644
--- a/atom/browser/api/atom_api_menu.h
+++ b/atom/browser/api/atom_api_menu.h
@@ -55,7 +55,7 @@ class Menu : public mate::TrackableObject<Menu>,
                        int x = -1, int y = -1,
                        int positioning_item = 0) = 0;
 
-  scoped_ptr<AtomMenuModel> model_;
+  std::unique_ptr<AtomMenuModel> model_;
   Menu* parent_;
 
  private:
diff --git a/atom/browser/api/atom_api_power_save_blocker.cc b/atom/browser/api/atom_api_power_save_blocker.cc
index b8adcb776e56..67c9b6dd83c2 100644
--- a/atom/browser/api/atom_api_power_save_blocker.cc
+++ b/atom/browser/api/atom_api_power_save_blocker.cc
@@ -70,7 +70,7 @@ void PowerSaveBlocker::UpdatePowerSaveBlocker() {
   }
 
   if (!power_save_blocker_ || new_blocker_type != current_blocker_type_) {
-    scoped_ptr<content::PowerSaveBlocker> new_blocker =
+    std::unique_ptr<content::PowerSaveBlocker> new_blocker =
         content::PowerSaveBlocker::Create(
             new_blocker_type,
             content::PowerSaveBlocker::kReasonOther,
diff --git a/atom/browser/api/atom_api_power_save_blocker.h b/atom/browser/api/atom_api_power_save_blocker.h
index c24ae0aa4b66..a20b493e75bf 100644
--- a/atom/browser/api/atom_api_power_save_blocker.h
+++ b/atom/browser/api/atom_api_power_save_blocker.h
@@ -37,7 +37,7 @@ class PowerSaveBlocker : public mate::TrackableObject<PowerSaveBlocker> {
   bool Stop(int id);
   bool IsStarted(int id);
 
-  scoped_ptr<content::PowerSaveBlocker> power_save_blocker_;
+  std::unique_ptr<content::PowerSaveBlocker> power_save_blocker_;
 
   // Currnet blocker type used by |power_save_blocker_|
   content::PowerSaveBlocker::PowerSaveBlockerType current_blocker_type_;
diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h
index 19fca9ac81bd..d33e63fa9cff 100644
--- a/atom/browser/api/atom_api_protocol.h
+++ b/atom/browser/api/atom_api_protocol.h
@@ -110,7 +110,7 @@ class Protocol : public mate::Wrappable<Protocol> {
                                      const Handler& handler) {
     if (job_factory_->IsHandledProtocol(scheme))
       return PROTOCOL_REGISTERED;
-    scoped_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
+    std::unique_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
         new CustomProtocolHandler<RequestJob>(
             isolate(), request_context_getter_, handler));
     if (job_factory_->SetProtocolHandler(scheme, std::move(protocol_handler)))
@@ -152,7 +152,7 @@ class Protocol : public mate::Wrappable<Protocol> {
       return PROTOCOL_FAIL;
     if (ContainsKey(original_protocols_, scheme))
       return PROTOCOL_INTERCEPTED;
-    scoped_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
+    std::unique_ptr<CustomProtocolHandler<RequestJob>> protocol_handler(
         new CustomProtocolHandler<RequestJob>(
             isolate(), request_context_getter_, handler));
     original_protocols_.set(
@@ -176,7 +176,7 @@ class Protocol : public mate::Wrappable<Protocol> {
   // Map that stores the original protocols of schemes.
   using OriginalProtocolsMap = base::ScopedPtrHashMap<
       std::string,
-      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>>;
+      std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>>;
   OriginalProtocolsMap original_protocols_;
 
   AtomURLRequestJobFactory* job_factory_;  // weak ref
diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
index 58fd358ca971..2e6ff448ce9b 100644
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -369,7 +369,7 @@ void Session::SetDownloadPath(const base::FilePath& path) {
 }
 
 void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
-  scoped_ptr<brightray::DevToolsNetworkConditions> conditions;
+  std::unique_ptr<brightray::DevToolsNetworkConditions> conditions;
   bool offline = false;
   double latency, download_throughput, upload_throughput;
   if (options.Get("offline", &offline) && offline) {
@@ -392,7 +392,7 @@ void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
 }
 
 void Session::DisableNetworkEmulation() {
-  scoped_ptr<brightray::DevToolsNetworkConditions> conditions;
+  std::unique_ptr<brightray::DevToolsNetworkConditions> conditions;
   browser_context_->network_controller_handle()->SetNetworkState(
       devtools_network_emulation_client_id_, std::move(conditions));
   browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
diff --git a/atom/browser/api/atom_api_system_preferences_mac.mm b/atom/browser/api/atom_api_system_preferences_mac.mm
index 1bc65a14f94b..f0b48adf2564 100644
--- a/atom/browser/api/atom_api_system_preferences_mac.mm
+++ b/atom/browser/api/atom_api_system_preferences_mac.mm
@@ -36,7 +36,7 @@ int SystemPreferences::SubscribeNotification(
       object:nil
       queue:nil
       usingBlock:^(NSNotification* notification) {
-        scoped_ptr<base::DictionaryValue> user_info =
+        std::unique_ptr<base::DictionaryValue> user_info =
             NSDictionaryToDictionaryValue(notification.userInfo);
         if (user_info) {
           copied_callback.Run(
diff --git a/atom/browser/api/atom_api_tray.h b/atom/browser/api/atom_api_tray.h
index 3c3d02e9ca40..a6c329567ca3 100644
--- a/atom/browser/api/atom_api_tray.h
+++ b/atom/browser/api/atom_api_tray.h
@@ -70,7 +70,7 @@ class Tray : public mate::TrackableObject<Tray>,
   v8::Local<v8::Object> ModifiersToObject(v8::Isolate* isolate, int modifiers);
 
   v8::Global<v8::Object> menu_;
-  scoped_ptr<TrayIcon> tray_icon_;
+  std::unique_ptr<TrayIcon> tray_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(Tray);
 };
diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index eac378b2a77f..2298a7b5ec18 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -155,7 +155,7 @@ struct Converter<net::HttpResponseHeaders*> {
           if (response_headers.GetList(key, &values))
             values->AppendString(value);
         } else {
-          scoped_ptr<base::ListValue> values(new base::ListValue());
+          std::unique_ptr<base::ListValue> values(new base::ListValue());
           values->AppendString(value);
           response_headers.Set(key, std::move(values));
         }
@@ -1125,7 +1125,7 @@ void WebContents::BeginFrameSubscription(
     const FrameSubscriber::FrameCaptureCallback& callback) {
   const auto view = web_contents()->GetRenderWidgetHostView();
   if (view) {
-    scoped_ptr<FrameSubscriber> frame_subscriber(new FrameSubscriber(
+    std::unique_ptr<FrameSubscriber> frame_subscriber(new FrameSubscriber(
         isolate(), view, callback));
     view->BeginFrameSubscription(std::move(frame_subscriber));
   }
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index 81d97dfdde6c..f3661bedd253 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -289,7 +289,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
   v8::Global<v8::Value> devtools_web_contents_;
   v8::Global<v8::Value> debugger_;
 
-  scoped_ptr<WebViewGuestDelegate> guest_delegate_;
+  std::unique_ptr<WebViewGuestDelegate> guest_delegate_;
 
   // The host webcontents that may contain this webcontents.
   WebContents* embedder_;
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index f174cdba88c6..e698eaaf78cc 100644
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -193,7 +193,7 @@ class Window : public mate::TrackableObject<Window>,
 
   api::WebContents* api_web_contents_;
 
-  scoped_ptr<NativeWindow> window_;
+  std::unique_ptr<NativeWindow> window_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
diff --git a/atom/browser/api/trackable_object.h b/atom/browser/api/trackable_object.h
index 2786261d8860..a5ed593a6ba6 100644
--- a/atom/browser/api/trackable_object.h
+++ b/atom/browser/api/trackable_object.h
@@ -123,7 +123,7 @@ class TrackableObject : public TrackableObjectBase,
 
  private:
   static int32_t next_id_;
-  static scoped_ptr<atom::KeyWeakMap<int32_t>> weak_map_;
+  static std::unique_ptr<atom::KeyWeakMap<int32_t>> weak_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TrackableObject);
 };
@@ -132,7 +132,7 @@ template<typename T>
 int32_t TrackableObject<T>::next_id_ = 0;
 
 template<typename T>
-scoped_ptr<atom::KeyWeakMap<int32_t>> TrackableObject<T>::weak_map_;
+std::unique_ptr<atom::KeyWeakMap<int32_t>> TrackableObject<T>::weak_map_;
 
 }  // namespace mate
 
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 8ecd37a6bca4..5fab9c60d1e9 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -208,7 +208,7 @@ void AtomBrowserClient::AllowCertificateError(
 void AtomBrowserClient::SelectClientCertificate(
     content::WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
-    scoped_ptr<content::ClientCertificateDelegate> delegate) {
+    std::unique_ptr<content::ClientCertificateDelegate> delegate) {
   if (!cert_request_info->client_certs.empty() && delegate_) {
     delegate_->SelectClientCertificate(
         web_contents, cert_request_info, std::move(delegate));
diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h
index ef5fd5a43300..5588f0435afa 100644
--- a/atom/browser/atom_browser_client.h
+++ b/atom/browser/atom_browser_client.h
@@ -73,7 +73,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
-      scoped_ptr<content::ClientCertificateDelegate> delegate) override;
+      std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
   void ResourceDispatcherHostCreated() override;
   bool CanCreateWindow(const GURL& opener_url,
                        const GURL& opener_top_level_frame_url,
@@ -106,7 +106,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
   // pending_render_process => current_render_process.
   std::map<int, int> pending_processes_;
 
-  scoped_ptr<AtomResourceDispatcherHostDelegate>
+  std::unique_ptr<AtomResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;
 
   Delegate* delegate_;
diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
index 04d5134a49e9..63da86f441f1 100644
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -46,7 +46,7 @@ namespace {
 
 class NoCacheBackend : public net::HttpCache::BackendFactory {
   int CreateBackend(net::NetLog* net_log,
-                    scoped_ptr<disk_cache::Backend>* backend,
+                    std::unique_ptr<disk_cache::Backend>* backend,
                     const net::CompletionCallback& callback) override {
     return net::ERR_FAILED;
   }
@@ -95,11 +95,11 @@ std::string AtomBrowserContext::GetUserAgent() {
   return content::BuildUserAgentFromProduct(user_agent);
 }
 
-scoped_ptr<net::URLRequestJobFactory>
+std::unique_ptr<net::URLRequestJobFactory>
 AtomBrowserContext::CreateURLRequestJobFactory(
     content::ProtocolHandlerMap* handlers,
     content::URLRequestInterceptorScopedVector* interceptors) {
-  scoped_ptr<AtomURLRequestJobFactory> job_factory(job_factory_);
+  std::unique_ptr<AtomURLRequestJobFactory> job_factory(job_factory_);
 
   for (auto& it : *handlers) {
     job_factory->SetProtocolHandler(it.first,
@@ -134,7 +134,7 @@ AtomBrowserContext::CreateURLRequestJobFactory(
           new net::FtpNetworkLayer(host_resolver))));
 
   // Set up interceptors in the reverse order.
-  scoped_ptr<net::URLRequestJobFactory> top_job_factory =
+  std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
       std::move(job_factory);
   content::URLRequestInterceptorScopedVector::reverse_iterator it;
   for (it = interceptors->rbegin(); it != interceptors->rend(); ++it)
@@ -177,7 +177,7 @@ content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
   return permission_manager_.get();
 }
 
-scoped_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
+std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
   return make_scoped_ptr(cert_verifier_);
 }
 
diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h
index d959adbc753a..b208ca97cc1b 100644
--- a/atom/browser/atom_browser_context.h
+++ b/atom/browser/atom_browser_context.h
@@ -26,12 +26,12 @@ class AtomBrowserContext : public brightray::BrowserContext {
   // brightray::URLRequestContextGetter::Delegate:
   net::NetworkDelegate* CreateNetworkDelegate() override;
   std::string GetUserAgent() override;
-  scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
+  std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
       content::ProtocolHandlerMap* handlers,
       content::URLRequestInterceptorScopedVector* interceptors) override;
   net::HttpCache::BackendFactory* CreateHttpCacheBackendFactory(
       const base::FilePath& base_path) override;
-  scoped_ptr<net::CertVerifier> CreateCertVerifier() override;
+  std::unique_ptr<net::CertVerifier> CreateCertVerifier() override;
   net::SSLConfigService* CreateSSLConfigService() override;
   bool AllowNTLMCredentialsForDomain(const GURL& auth_origin) override;
 
@@ -52,9 +52,9 @@ class AtomBrowserContext : public brightray::BrowserContext {
   AtomNetworkDelegate* network_delegate() const { return network_delegate_; }
 
  private:
-  scoped_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
-  scoped_ptr<WebViewManager> guest_manager_;
-  scoped_ptr<AtomPermissionManager> permission_manager_;
+  std::unique_ptr<AtomDownloadManagerDelegate> download_manager_delegate_;
+  std::unique_ptr<WebViewManager> guest_manager_;
+  std::unique_ptr<AtomPermissionManager> permission_manager_;
 
   // Managed by brightray::BrowserContext.
   AtomCertVerifier* cert_verifier_;
diff --git a/atom/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h
index e1053a257b91..0d8619f6865a 100644
--- a/atom/browser/atom_browser_main_parts.h
+++ b/atom/browser/atom_browser_main_parts.h
@@ -68,7 +68,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
 #endif
 
   // A fake BrowserProcess object that used to feed the source code from chrome.
-  scoped_ptr<BrowserProcess> fake_browser_process_;
+  std::unique_ptr<BrowserProcess> fake_browser_process_;
 
   // The gin::PerIsolateData requires a task runner to create, so we feed it
   // with a task runner that will post all work to main loop.
@@ -77,11 +77,11 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
   // Pointer to exit code.
   int* exit_code_;
 
-  scoped_ptr<Browser> browser_;
-  scoped_ptr<JavascriptEnvironment> js_env_;
-  scoped_ptr<NodeBindings> node_bindings_;
-  scoped_ptr<AtomBindings> atom_bindings_;
-  scoped_ptr<NodeDebugger> node_debugger_;
+  std::unique_ptr<Browser> browser_;
+  std::unique_ptr<JavascriptEnvironment> js_env_;
+  std::unique_ptr<NodeBindings> node_bindings_;
+  std::unique_ptr<AtomBindings> atom_bindings_;
+  std::unique_ptr<NodeDebugger> node_debugger_;
 
   base::Timer gc_timer_;
 
diff --git a/atom/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc
index c21d1fb11816..e1299821f5e4 100644
--- a/atom/browser/atom_javascript_dialog_manager.cc
+++ b/atom/browser/atom_javascript_dialog_manager.cc
@@ -13,7 +13,6 @@ namespace atom {
 void AtomJavaScriptDialogManager::RunJavaScriptDialog(
     content::WebContents* web_contents,
     const GURL& origin_url,
-    const std::string& accept_lang,
     content::JavaScriptMessageType javascript_message_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
@@ -24,12 +23,10 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
 
 void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
-    const base::string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
-  bool prevent_reload = message_text.empty() ||
-                        message_text == base::ASCIIToUTF16("false");
-  callback.Run(!prevent_reload, message_text);
+  // FIXME(zcbenz): the |message_text| is removed, figure out what should we do.
+  callback.Run(true);
 }
 
 }  // namespace atom
diff --git a/atom/browser/atom_javascript_dialog_manager.h b/atom/browser/atom_javascript_dialog_manager.h
index c0a0dccf0fa9..3844e41f9d2f 100644
--- a/atom/browser/atom_javascript_dialog_manager.h
+++ b/atom/browser/atom_javascript_dialog_manager.h
@@ -17,7 +17,6 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
   void RunJavaScriptDialog(
       content::WebContents* web_contents,
       const GURL& origin_url,
-      const std::string& accept_lang,
       content::JavaScriptMessageType javascript_message_type,
       const base::string16& message_text,
       const base::string16& default_prompt_text,
@@ -25,7 +24,6 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
       bool* did_suppress_message) override;
   void RunBeforeUnloadDialog(
       content::WebContents* web_contents,
-      const base::string16& message_text,
       bool is_reload,
       const DialogClosedCallback& callback) override;
   void CancelActiveAndPendingDialogs(
diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc
index a102a1cb5c9a..7fc5fa0d0378 100644
--- a/atom/browser/atom_permission_manager.cc
+++ b/atom/browser/atom_permission_manager.cc
@@ -40,7 +40,7 @@ void AtomPermissionManager::SetPermissionRequestHandler(
   if (handler.is_null() && !pending_requests_.empty()) {
     for (const auto& request : pending_requests_) {
       if (!WebContentsDestroyed(request.second.render_process_id))
-        request.second.callback.Run(content::PermissionStatus::DENIED);
+        request.second.callback.Run(blink::mojom::PermissionStatus::DENIED);
     }
     pending_requests_.clear();
   }
@@ -73,7 +73,7 @@ int AtomPermissionManager::RequestPermission(
     return request_id_;
   }
 
-  response_callback.Run(content::PermissionStatus::GRANTED);
+  response_callback.Run(blink::mojom::PermissionStatus::GRANTED);
   return kNoPendingOperation;
 }
 
@@ -82,15 +82,15 @@ int AtomPermissionManager::RequestPermissions(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const base::Callback<void(
-    const std::vector<content::PermissionStatus>&)>& callback) {
+    const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
   // FIXME(zcbenz): Just ignore multiple permissions request for now.
-  std::vector<content::PermissionStatus> permissionStatuses;
+  std::vector<blink::mojom::PermissionStatus> permissionStatuses;
   for (auto permission : permissions) {
     if (permission == content::PermissionType::MIDI_SYSEX) {
       content::ChildProcessSecurityPolicy::GetInstance()->
           GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID());
     }
-    permissionStatuses.push_back(content::PermissionStatus::GRANTED);
+    permissionStatuses.push_back(blink::mojom::PermissionStatus::GRANTED);
   }
   callback.Run(permissionStatuses);
   return kNoPendingOperation;
@@ -100,7 +100,7 @@ void AtomPermissionManager::OnPermissionResponse(
     int request_id,
     const GURL& origin,
     const ResponseCallback& callback,
-    content::PermissionStatus status) {
+    blink::mojom::PermissionStatus status) {
   auto request = pending_requests_.find(request_id);
   if (request != pending_requests_.end()) {
     if (!WebContentsDestroyed(request->second.render_process_id))
@@ -113,7 +113,7 @@ void AtomPermissionManager::CancelPermissionRequest(int request_id) {
   auto request = pending_requests_.find(request_id);
   if (request != pending_requests_.end()) {
     if (!WebContentsDestroyed(request->second.render_process_id))
-      request->second.callback.Run(content::PermissionStatus::DENIED);
+      request->second.callback.Run(blink::mojom::PermissionStatus::DENIED);
     pending_requests_.erase(request);
   }
 }
@@ -124,11 +124,11 @@ void AtomPermissionManager::ResetPermission(
     const GURL& embedding_origin) {
 }
 
-content::PermissionStatus AtomPermissionManager::GetPermissionStatus(
+blink::mojom::PermissionStatus AtomPermissionManager::GetPermissionStatus(
     content::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
-  return content::PermissionStatus::GRANTED;
+  return blink::mojom::PermissionStatus::GRANTED;
 }
 
 void AtomPermissionManager::RegisterPermissionUsage(
diff --git a/atom/browser/atom_permission_manager.h b/atom/browser/atom_permission_manager.h
index 7361e6bc0541..d0fcdc60768f 100644
--- a/atom/browser/atom_permission_manager.h
+++ b/atom/browser/atom_permission_manager.h
@@ -23,7 +23,7 @@ class AtomPermissionManager : public content::PermissionManager {
   ~AtomPermissionManager() override;
 
   using ResponseCallback =
-      base::Callback<void(content::PermissionStatus)>;
+      base::Callback<void(blink::mojom::PermissionStatus)>;
   using RequestHandler =
       base::Callback<void(content::WebContents*,
                           content::PermissionType,
@@ -43,20 +43,20 @@ class AtomPermissionManager : public content::PermissionManager {
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       const base::Callback<void(
-      const std::vector<content::PermissionStatus>&)>& callback) override;
+      const std::vector<blink::mojom::PermissionStatus>&)>& callback) override;
 
  protected:
   void OnPermissionResponse(int request_id,
                             const GURL& url,
                             const ResponseCallback& callback,
-                            content::PermissionStatus status);
+                            blink::mojom::PermissionStatus status);
 
   // content::PermissionManager:
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
-  content::PermissionStatus GetPermissionStatus(
+  blink::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
@@ -67,7 +67,8 @@ class AtomPermissionManager : public content::PermissionManager {
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
-      const base::Callback<void(content::PermissionStatus)>& callback) override;
+      const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+      override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
diff --git a/atom/browser/atom_security_state_model_client.h b/atom/browser/atom_security_state_model_client.h
index cc943eb7f949..0dd3aa66c125 100644
--- a/atom/browser/atom_security_state_model_client.h
+++ b/atom/browser/atom_security_state_model_client.h
@@ -32,7 +32,7 @@ class AtomSecurityStateModelClient
   friend class content::WebContentsUserData<AtomSecurityStateModelClient>;
 
   content::WebContents* web_contents_;
-  scoped_ptr<security_state::SecurityStateModel> security_state_model_;
+  std::unique_ptr<security_state::SecurityStateModel> security_state_model_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomSecurityStateModelClient);
 };
diff --git a/atom/browser/browser_win.cc b/atom/browser/browser_win.cc
index 7b1402ba2d2c..345e2bcf67ce 100644
--- a/atom/browser/browser_win.cc
+++ b/atom/browser/browser_win.cc
@@ -281,7 +281,7 @@ PCWSTR Browser::GetAppUserModelID() {
 std::string Browser::GetExecutableFileVersion() const {
   base::FilePath path;
   if (PathService::Get(base::FILE_EXE, &path)) {
-    scoped_ptr<FileVersionInfo> version_info(
+    std::unique_ptr<FileVersionInfo> version_info(
         FileVersionInfo::CreateFileVersionInfo(path));
     return base::UTF16ToUTF8(version_info->product_version());
   }
@@ -292,7 +292,7 @@ std::string Browser::GetExecutableFileVersion() const {
 std::string Browser::GetExecutableFileProductName() const {
   base::FilePath path;
   if (PathService::Get(base::FILE_EXE, &path)) {
-    scoped_ptr<FileVersionInfo> version_info(
+    std::unique_ptr<FileVersionInfo> version_info(
         FileVersionInfo::CreateFileVersionInfo(path));
     return base::UTF16ToUTF8(version_info->product_name());
   }
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index ea2bf8677cba..c275d4aee74e 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -464,7 +464,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
   FileSystem file_system = CreateFileSystemStruct(GetDevToolsWebContents(),
                                                  file_system_id,
                                                  path.AsUTF8Unsafe());
-  scoped_ptr<base::DictionaryValue> file_system_value(
+  std::unique_ptr<base::DictionaryValue> file_system_value(
       CreateFileSystemValue(file_system));
 
   auto pref_service = GetPrefService(GetDevToolsWebContents());
diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h
index 095dad3bcebe..1746d63b2082 100644
--- a/atom/browser/common_web_contents_delegate.h
+++ b/atom/browser/common_web_contents_delegate.h
@@ -146,8 +146,8 @@ class CommonWebContentsDelegate
   // Whether window is fullscreened by window api.
   bool native_fullscreen_;
 
-  scoped_ptr<WebDialogHelper> web_dialog_helper_;
-  scoped_ptr<AtomJavaScriptDialogManager> dialog_manager_;
+  std::unique_ptr<WebDialogHelper> web_dialog_helper_;
+  std::unique_ptr<AtomJavaScriptDialogManager> dialog_manager_;
   scoped_refptr<DevToolsFileSystemIndexer> devtools_file_system_indexer_;
 
   // Make sure BrowserContext is alwasys destroyed after WebContents.
@@ -157,7 +157,7 @@ class CommonWebContentsDelegate
   // Notice that web_contents_ must be placed after dialog_manager_, so we can
   // make sure web_contents_ is destroyed before dialog_manager_, otherwise a
   // crash would happen.
-  scoped_ptr<brightray::InspectableWebContents> web_contents_;
+  std::unique_ptr<brightray::InspectableWebContents> web_contents_;
 
   // Maps url to file path, used by the file requests sent from devtools.
   typedef std::map<std::string, base::FilePath> PathsMap;
diff --git a/atom/browser/mac/atom_application_delegate.mm b/atom/browser/mac/atom_application_delegate.mm
index 7fa3b3027f6c..84caae9d5ee3 100644
--- a/atom/browser/mac/atom_application_delegate.mm
+++ b/atom/browser/mac/atom_application_delegate.mm
@@ -65,7 +65,7 @@
 continueUserActivity:(NSUserActivity*)userActivity
   restorationHandler:(void (^)(NSArray*restorableObjects))restorationHandler {
   std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
-  scoped_ptr<base::DictionaryValue> user_info =
+  std::unique_ptr<base::DictionaryValue> user_info =
       atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
   if (!user_info)
     return NO;
diff --git a/atom/browser/mac/dict_util.h b/atom/browser/mac/dict_util.h
index e5b293652d8a..404636d1901a 100644
--- a/atom/browser/mac/dict_util.h
+++ b/atom/browser/mac/dict_util.h
@@ -18,7 +18,7 @@ namespace atom {
 
 NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value);
 
-scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
+std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
     NSDictionary* dict);
 
 }  // namespace atom
diff --git a/atom/browser/mac/dict_util.mm b/atom/browser/mac/dict_util.mm
index 1fb8401a2a23..43b629cc32be 100644
--- a/atom/browser/mac/dict_util.mm
+++ b/atom/browser/mac/dict_util.mm
@@ -12,11 +12,11 @@ namespace atom {
 
 namespace {
 
-scoped_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
+std::unique_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
   if (!arr)
     return nullptr;
 
-  scoped_ptr<base::ListValue> result(new base::ListValue);
+  std::unique_ptr<base::ListValue> result(new base::ListValue);
   for (id value in arr) {
     if ([value isKindOfClass:[NSString class]]) {
       result->AppendString(base::SysNSStringToUTF8(value));
@@ -31,13 +31,13 @@ scoped_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
       else
         result->AppendInteger([value intValue]);
     } else if ([value isKindOfClass:[NSArray class]]) {
-      scoped_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
+      std::unique_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
       if (sub_arr)
         result->Append(std::move(sub_arr));
       else
         result->Append(base::Value::CreateNullValue());
     } else if ([value isKindOfClass:[NSDictionary class]]) {
-      scoped_ptr<base::DictionaryValue> sub_dict =
+      std::unique_ptr<base::DictionaryValue> sub_dict =
           NSDictionaryToDictionaryValue(value);
       if (sub_dict)
         result->Append(std::move(sub_dict));
@@ -66,12 +66,12 @@ NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value)
   return obj;
 }
 
-scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
+std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
     NSDictionary* dict) {
   if (!dict)
     return nullptr;
 
-  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
   for (id key in dict) {
     std::string str_key = base::SysNSStringToUTF8(
         [key isKindOfClass:[NSString class]] ? key : [key description]);
@@ -91,14 +91,14 @@ scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
       else
         result->SetIntegerWithoutPathExpansion(str_key, [value intValue]);
     } else if ([value isKindOfClass:[NSArray class]]) {
-      scoped_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
+      std::unique_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
       if (sub_arr)
         result->SetWithoutPathExpansion(str_key, std::move(sub_arr));
       else
         result->SetWithoutPathExpansion(str_key,
                                         base::Value::CreateNullValue());
     } else if ([value isKindOfClass:[NSDictionary class]]) {
-      scoped_ptr<base::DictionaryValue> sub_dict =
+      std::unique_ptr<base::DictionaryValue> sub_dict =
           NSDictionaryToDictionaryValue(value);
       if (sub_dict)
         result->SetWithoutPathExpansion(str_key, std::move(sub_dict));
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 31567c197508..651d9eb35f80 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -527,9 +527,9 @@ void NativeWindow::NotifyWindowMessage(
 }
 #endif
 
-scoped_ptr<SkRegion> NativeWindow::DraggableRegionsToSkRegion(
+std::unique_ptr<SkRegion> NativeWindow::DraggableRegionsToSkRegion(
     const std::vector<DraggableRegion>& regions) {
-  scoped_ptr<SkRegion> sk_region(new SkRegion);
+  std::unique_ptr<SkRegion> sk_region(new SkRegion);
   for (const DraggableRegion& region : regions) {
     sk_region->op(
         region.bounds.x(),
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 7bc432d45deb..a9b5ffc3f783 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -263,7 +263,7 @@ class NativeWindow : public base::SupportsUserData,
 
   // Convert draggable regions in raw format to SkRegion format. Caller is
   // responsible for deleting the returned SkRegion instance.
-  scoped_ptr<SkRegion> DraggableRegionsToSkRegion(
+  std::unique_ptr<SkRegion> DraggableRegionsToSkRegion(
       const std::vector<DraggableRegion>& regions);
 
   // Converts between content size to window size.
@@ -299,7 +299,7 @@ class NativeWindow : public base::SupportsUserData,
 
   // For custom drag, the whole window is non-draggable and the draggable region
   // has to been explicitly provided.
-  scoped_ptr<SkRegion> draggable_region_;  // used in custom drag.
+  std::unique_ptr<SkRegion> draggable_region_;  // used in custom drag.
 
   // Minimum and maximum size, stored as content size.
   extensions::SizeConstraints size_constraints_;
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 333b282266f5..10dd17785c3d 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -942,8 +942,8 @@ std::vector<gfx::Rect> NativeWindowMac::CalculateNonDraggableRegions(
   if (regions.empty()) {
     result.push_back(gfx::Rect(0, 0, width, height));
   } else {
-    scoped_ptr<SkRegion> draggable(DraggableRegionsToSkRegion(regions));
-    scoped_ptr<SkRegion> non_draggable(new SkRegion);
+    std::unique_ptr<SkRegion> draggable(DraggableRegionsToSkRegion(regions));
+    std::unique_ptr<SkRegion> non_draggable(new SkRegion);
     non_draggable->op(0, 0, width, height, SkRegion::kUnion_Op);
     non_draggable->op(*draggable, SkRegion::kDifference_Op);
     for (SkRegion::Iterator it(*non_draggable); !it.done(); it.next()) {
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 8a5d8ae0e082..85c7ddbeba7a 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -170,19 +170,19 @@ class NativeWindowViews : public NativeWindow,
   // Returns the restore state for the window.
   ui::WindowShowState GetRestoredState();
 
-  scoped_ptr<views::Widget> window_;
+  std::unique_ptr<views::Widget> window_;
   views::View* web_view_;  // Managed by inspectable_web_contents_.
 
-  scoped_ptr<MenuBar> menu_bar_;
+  std::unique_ptr<MenuBar> menu_bar_;
   bool menu_bar_autohide_;
   bool menu_bar_visible_;
   bool menu_bar_alt_pressed_;
 
 #if defined(USE_X11)
-  scoped_ptr<GlobalMenuBarX11> global_menu_bar_;
+  std::unique_ptr<GlobalMenuBarX11> global_menu_bar_;
 
   // Handles window state events.
-  scoped_ptr<WindowStateWatcher> window_state_watcher_;
+  std::unique_ptr<WindowStateWatcher> window_state_watcher_;
 
   // The "resizable" flag on Linux is implemented by setting size constraints,
   // we need to make sure size constraints are restored when window becomes
@@ -208,7 +208,7 @@ class NativeWindowViews : public NativeWindow,
 #endif
 
   // Handles unhandled keyboard messages coming back from the renderer process.
-  scoped_ptr<views::UnhandledKeyboardEventHandler> keyboard_event_handler_;
+  std::unique_ptr<views::UnhandledKeyboardEventHandler> keyboard_event_handler_;
 
   // Map from accelerator to menu item's command id.
   accelerator_util::AcceleratorTable accelerator_table_;
diff --git a/atom/browser/net/asar/url_request_asar_job.h b/atom/browser/net/asar/url_request_asar_job.h
index 7103abc4139a..56c519823c0e 100644
--- a/atom/browser/net/asar/url_request_asar_job.h
+++ b/atom/browser/net/asar/url_request_asar_job.h
@@ -112,7 +112,7 @@ class URLRequestAsarJob : public net::URLRequestJob {
   base::FilePath file_path_;
   Archive::FileInfo file_info_;
 
-  scoped_ptr<net::FileStream> stream_;
+  std::unique_ptr<net::FileStream> stream_;
   FileMetaInfo meta_info_;
   scoped_refptr<base::TaskRunner> file_task_runner_;
 
diff --git a/atom/browser/net/atom_cert_verifier.cc b/atom/browser/net/atom_cert_verifier.cc
index 3633d805fb5b..adfba7060c90 100644
--- a/atom/browser/net/atom_cert_verifier.cc
+++ b/atom/browser/net/atom_cert_verifier.cc
@@ -48,7 +48,7 @@ int AtomCertVerifier::Verify(
     net::CRLSet* crl_set,
     net::CertVerifyResult* verify_result,
     const net::CompletionCallback& callback,
-    scoped_ptr<Request>* out_req,
+    std::unique_ptr<Request>* out_req,
     const net::BoundNetLog& net_log) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
diff --git a/atom/browser/net/atom_cert_verifier.h b/atom/browser/net/atom_cert_verifier.h
index 796ae2849bda..e00ba260ec3f 100644
--- a/atom/browser/net/atom_cert_verifier.h
+++ b/atom/browser/net/atom_cert_verifier.h
@@ -34,14 +34,14 @@ class AtomCertVerifier : public net::CertVerifier {
              net::CRLSet* crl_set,
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
-             scoped_ptr<Request>* out_req,
+             std::unique_ptr<Request>* out_req,
              const net::BoundNetLog& net_log) override;
   bool SupportsOCSPStapling() override;
 
  private:
   base::Lock lock_;
   VerifyProc verify_proc_;
-  scoped_ptr<net::CertVerifier> default_cert_verifier_;
+  std::unique_ptr<net::CertVerifier> default_cert_verifier_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomCertVerifier);
 };
diff --git a/atom/browser/net/atom_network_delegate.cc b/atom/browser/net/atom_network_delegate.cc
index 39e0f732656b..fd0c52b3554f 100644
--- a/atom/browser/net/atom_network_delegate.cc
+++ b/atom/browser/net/atom_network_delegate.cc
@@ -45,13 +45,13 @@ using ResponseHeadersContainer =
     std::pair<scoped_refptr<net::HttpResponseHeaders>*, const std::string&>;
 
 void RunSimpleListener(const AtomNetworkDelegate::SimpleListener& listener,
-                       scoped_ptr<base::DictionaryValue> details) {
+                       std::unique_ptr<base::DictionaryValue> details) {
   return listener.Run(*(details.get()));
 }
 
 void RunResponseListener(
     const AtomNetworkDelegate::ResponseListener& listener,
-    scoped_ptr<base::DictionaryValue> details,
+    std::unique_ptr<base::DictionaryValue> details,
     const AtomNetworkDelegate::ResponseCallback& callback) {
   return listener.Run(*(details.get()), callback);
 }
@@ -79,7 +79,7 @@ void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
   details->SetString("resourceType",
                      info ? ResourceTypeToString(info->GetResourceType())
                           : "other");
-  scoped_ptr<base::ListValue> list(new base::ListValue);
+  std::unique_ptr<base::ListValue> list(new base::ListValue);
   GetUploadData(list.get(), request);
   if (!list->empty())
     details->Set("uploadData", std::move(list));
@@ -87,7 +87,7 @@ void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
 
 void ToDictionary(base::DictionaryValue* details,
                   const net::HttpRequestHeaders& headers) {
-  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
   net::HttpRequestHeaders::Iterator it(headers);
   while (it.GetNext())
     dict->SetString(it.name(), it.value());
@@ -99,7 +99,7 @@ void ToDictionary(base::DictionaryValue* details,
   if (!headers)
     return;
 
-  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
   size_t iter = 0;
   std::string key;
   std::string value;
@@ -109,7 +109,7 @@ void ToDictionary(base::DictionaryValue* details,
       if (dict->GetList(key, &values))
         values->AppendString(value);
     } else {
-      scoped_ptr<base::ListValue> values(new base::ListValue);
+      std::unique_ptr<base::ListValue> values(new base::ListValue);
       values->AppendString(value);
       dict->Set(key, std::move(values));
     }
@@ -369,7 +369,7 @@ int AtomNetworkDelegate::HandleResponseEvent(
   if (!MatchesFilterCondition(request, info.url_patterns))
     return net::OK;
 
-  scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue);
   FillDetailsObject(details.get(), request, args...);
 
   // The |request| could be destroyed before the |callback| is called.
@@ -392,7 +392,7 @@ void AtomNetworkDelegate::HandleSimpleEvent(
   if (!MatchesFilterCondition(request, info.url_patterns))
     return;
 
-  scoped_ptr<base::DictionaryValue> details(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue);
   FillDetailsObject(details.get(), request, args...);
 
   BrowserThread::PostTask(
@@ -402,7 +402,7 @@ void AtomNetworkDelegate::HandleSimpleEvent(
 
 template<typename T>
 void AtomNetworkDelegate::OnListenerResultInIO(
-    uint64_t id, T out, scoped_ptr<base::DictionaryValue> response) {
+    uint64_t id, T out, std::unique_ptr<base::DictionaryValue> response) {
   // The request has been destroyed.
   if (!ContainsKey(callbacks_, id))
     return;
@@ -417,7 +417,7 @@ void AtomNetworkDelegate::OnListenerResultInIO(
 template<typename T>
 void AtomNetworkDelegate::OnListenerResultInUI(
     uint64_t id, T out, const base::DictionaryValue& response) {
-  scoped_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
+  std::unique_ptr<base::DictionaryValue> copy = response.CreateDeepCopy();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&AtomNetworkDelegate::OnListenerResultInIO<T>,
diff --git a/atom/browser/net/atom_network_delegate.h b/atom/browser/net/atom_network_delegate.h
index 701a953c265e..62653df0baeb 100644
--- a/atom/browser/net/atom_network_delegate.h
+++ b/atom/browser/net/atom_network_delegate.h
@@ -111,7 +111,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
   // Deal with the results of Listener.
   template<typename T>
   void OnListenerResultInIO(
-      uint64_t id, T out, scoped_ptr<base::DictionaryValue> response);
+      uint64_t id, T out, std::unique_ptr<base::DictionaryValue> response);
   template<typename T>
   void OnListenerResultInUI(
       uint64_t id, T out, const base::DictionaryValue& response);
diff --git a/atom/browser/net/atom_url_request_job_factory.cc b/atom/browser/net/atom_url_request_job_factory.cc
index dbd8b4160cfd..3bf332d0fb33 100644
--- a/atom/browser/net/atom_url_request_job_factory.cc
+++ b/atom/browser/net/atom_url_request_job_factory.cc
@@ -23,7 +23,7 @@ AtomURLRequestJobFactory::~AtomURLRequestJobFactory() {
 }
 
 bool AtomURLRequestJobFactory::SetProtocolHandler(
-    const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler) {
+    const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler) {
   if (!protocol_handler) {
     ProtocolHandlerMap::iterator it = protocol_handler_map_.find(scheme);
     if (it == protocol_handler_map_.end())
@@ -40,8 +40,8 @@ bool AtomURLRequestJobFactory::SetProtocolHandler(
   return true;
 }
 
-scoped_ptr<ProtocolHandler> AtomURLRequestJobFactory::ReplaceProtocol(
-    const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler) {
+std::unique_ptr<ProtocolHandler> AtomURLRequestJobFactory::ReplaceProtocol(
+    const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler) {
   if (!ContainsKey(protocol_handler_map_, scheme))
     return nullptr;
   ProtocolHandler* original_protocol_handler = protocol_handler_map_[scheme];
diff --git a/atom/browser/net/atom_url_request_job_factory.h b/atom/browser/net/atom_url_request_job_factory.h
index dde36225b7af..ba7a4796f9a5 100644
--- a/atom/browser/net/atom_url_request_job_factory.h
+++ b/atom/browser/net/atom_url_request_job_factory.h
@@ -25,12 +25,12 @@ class AtomURLRequestJobFactory : public net::URLRequestJobFactory {
   // failure (a ProtocolHandler already exists for |scheme|). On success,
   // URLRequestJobFactory takes ownership of |protocol_handler|.
   bool SetProtocolHandler(
-      const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler);
+      const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler);
 
   // Intercepts the ProtocolHandler for a scheme. Returns the original protocol
   // handler on success, otherwise returns NULL.
-  scoped_ptr<ProtocolHandler> ReplaceProtocol(
-      const std::string& scheme, scoped_ptr<ProtocolHandler> protocol_handler);
+  std::unique_ptr<ProtocolHandler> ReplaceProtocol(
+      const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler);
 
   // Returns the protocol handler registered with scheme.
   ProtocolHandler* GetProtocolHandler(const std::string& scheme) const;
diff --git a/atom/browser/net/js_asker.cc b/atom/browser/net/js_asker.cc
index b11a69c9c13b..8362c1add1c6 100644
--- a/atom/browser/net/js_asker.cc
+++ b/atom/browser/net/js_asker.cc
@@ -34,7 +34,7 @@ void HandlerCallback(const BeforeStartCallback& before_start,
   // Pass whatever user passed to the actaul request job.
   V8ValueConverter converter;
   v8::Local<v8::Context> context = args->isolate()->GetCurrentContext();
-  scoped_ptr<base::Value> options(converter.FromV8Value(value, context));
+  std::unique_ptr<base::Value> options(converter.FromV8Value(value, context));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(callback, true, base::Passed(&options)));
diff --git a/atom/browser/net/js_asker.h b/atom/browser/net/js_asker.h
index 8a70794fa946..6301f4de2c2a 100644
--- a/atom/browser/net/js_asker.h
+++ b/atom/browser/net/js_asker.h
@@ -26,7 +26,7 @@ namespace internal {
 using BeforeStartCallback =
     base::Callback<void(v8::Isolate*, v8::Local<v8::Value>)>;
 using ResponseCallback =
-    base::Callback<void(bool, scoped_ptr<base::Value> options)>;
+    base::Callback<void(bool, std::unique_ptr<base::Value> options)>;
 
 // Ask handler for options in UI thread.
 void AskForOptions(v8::Isolate* isolate,
@@ -58,7 +58,7 @@ class JsAsker : public RequestJob {
 
   // Subclass should do initailze work here.
   virtual void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) {}
-  virtual void StartAsync(scoped_ptr<base::Value> options) = 0;
+  virtual void StartAsync(std::unique_ptr<base::Value> options) = 0;
 
   net::URLRequestContextGetter* request_context_getter() const {
     return request_context_getter_;
@@ -84,7 +84,7 @@ class JsAsker : public RequestJob {
 
   // Called when the JS handler has sent the response, we need to decide whether
   // to start, or fail the job.
-  void OnResponse(bool success, scoped_ptr<base::Value> value) {
+  void OnResponse(bool success, std::unique_ptr<base::Value> value) {
     int error = net::ERR_NOT_IMPLEMENTED;
     if (success && value && !internal::IsErrorOptions(value.get(), &error)) {
       StartAsync(std::move(value));
diff --git a/atom/browser/net/url_request_async_asar_job.cc b/atom/browser/net/url_request_async_asar_job.cc
index 3578f3b7971c..1234bccf4303 100644
--- a/atom/browser/net/url_request_async_asar_job.cc
+++ b/atom/browser/net/url_request_async_asar_job.cc
@@ -16,7 +16,7 @@ URLRequestAsyncAsarJob::URLRequestAsyncAsarJob(
     : JsAsker<asar::URLRequestAsarJob>(request, network_delegate) {
 }
 
-void URLRequestAsyncAsarJob::StartAsync(scoped_ptr<base::Value> options) {
+void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
   base::FilePath::StringType file_path;
   if (options->IsType(base::Value::TYPE_DICTIONARY)) {
     static_cast<base::DictionaryValue*>(options.get())->GetString(
diff --git a/atom/browser/net/url_request_async_asar_job.h b/atom/browser/net/url_request_async_asar_job.h
index d65142f0bdbb..032f3d992413 100644
--- a/atom/browser/net/url_request_async_asar_job.h
+++ b/atom/browser/net/url_request_async_asar_job.h
@@ -16,7 +16,7 @@ class URLRequestAsyncAsarJob : public JsAsker<asar::URLRequestAsarJob> {
   URLRequestAsyncAsarJob(net::URLRequest*, net::NetworkDelegate*);
 
   // JsAsker:
-  void StartAsync(scoped_ptr<base::Value> options) override;
+  void StartAsync(std::unique_ptr<base::Value> options) override;
 
   // URLRequestJob:
   void GetResponseInfo(net::HttpResponseInfo* info) override;
diff --git a/atom/browser/net/url_request_buffer_job.cc b/atom/browser/net/url_request_buffer_job.cc
index aa273bf81693..c0c8e1584e69 100644
--- a/atom/browser/net/url_request_buffer_job.cc
+++ b/atom/browser/net/url_request_buffer_job.cc
@@ -18,7 +18,7 @@ URLRequestBufferJob::URLRequestBufferJob(
       status_code_(net::HTTP_NOT_IMPLEMENTED) {
 }
 
-void URLRequestBufferJob::StartAsync(scoped_ptr<base::Value> options) {
+void URLRequestBufferJob::StartAsync(std::unique_ptr<base::Value> options) {
   const base::BinaryValue* binary = nullptr;
   if (options->IsType(base::Value::TYPE_DICTIONARY)) {
     base::DictionaryValue* dict =
diff --git a/atom/browser/net/url_request_buffer_job.h b/atom/browser/net/url_request_buffer_job.h
index ab8de7e8f030..356ca9347f6f 100644
--- a/atom/browser/net/url_request_buffer_job.h
+++ b/atom/browser/net/url_request_buffer_job.h
@@ -19,7 +19,7 @@ class URLRequestBufferJob : public JsAsker<net::URLRequestSimpleJob> {
   URLRequestBufferJob(net::URLRequest*, net::NetworkDelegate*);
 
   // JsAsker:
-  void StartAsync(scoped_ptr<base::Value> options) override;
+  void StartAsync(std::unique_ptr<base::Value> options) override;
 
   // URLRequestJob:
   void GetResponseInfo(net::HttpResponseInfo* info) override;
diff --git a/atom/browser/net/url_request_fetch_job.cc b/atom/browser/net/url_request_fetch_job.cc
index 2f907314cad4..b6aadc89ec62 100644
--- a/atom/browser/net/url_request_fetch_job.cc
+++ b/atom/browser/net/url_request_fetch_job.cc
@@ -99,7 +99,7 @@ void URLRequestFetchJob::BeforeStartInUI(
   }
 }
 
-void URLRequestFetchJob::StartAsync(scoped_ptr<base::Value> options) {
+void URLRequestFetchJob::StartAsync(std::unique_ptr<base::Value> options) {
   if (!options->IsType(base::Value::TYPE_DICTIONARY)) {
     NotifyStartError(net::URLRequestStatus(
           net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
diff --git a/atom/browser/net/url_request_fetch_job.h b/atom/browser/net/url_request_fetch_job.h
index 69067fdc7fd3..65d73f27ca94 100644
--- a/atom/browser/net/url_request_fetch_job.h
+++ b/atom/browser/net/url_request_fetch_job.h
@@ -30,7 +30,7 @@ class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
  protected:
   // JsAsker:
   void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) override;
-  void StartAsync(scoped_ptr<base::Value> options) override;
+  void StartAsync(std::unique_ptr<base::Value> options) override;
 
   // net::URLRequestJob:
   void Kill() override;
@@ -44,10 +44,10 @@ class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
 
  private:
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-  scoped_ptr<net::URLFetcher> fetcher_;
+  std::unique_ptr<net::URLFetcher> fetcher_;
   scoped_refptr<net::IOBuffer> pending_buffer_;
   int pending_buffer_size_;
-  scoped_ptr<net::HttpResponseInfo> response_info_;
+  std::unique_ptr<net::HttpResponseInfo> response_info_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestFetchJob);
 };
diff --git a/atom/browser/net/url_request_string_job.cc b/atom/browser/net/url_request_string_job.cc
index 606781142da0..59945e66db07 100644
--- a/atom/browser/net/url_request_string_job.cc
+++ b/atom/browser/net/url_request_string_job.cc
@@ -16,7 +16,7 @@ URLRequestStringJob::URLRequestStringJob(
     : JsAsker<net::URLRequestSimpleJob>(request, network_delegate) {
 }
 
-void URLRequestStringJob::StartAsync(scoped_ptr<base::Value> options) {
+void URLRequestStringJob::StartAsync(std::unique_ptr<base::Value> options) {
   if (options->IsType(base::Value::TYPE_DICTIONARY)) {
     base::DictionaryValue* dict =
         static_cast<base::DictionaryValue*>(options.get());
diff --git a/atom/browser/net/url_request_string_job.h b/atom/browser/net/url_request_string_job.h
index e40f0d93dab7..474473cca87d 100644
--- a/atom/browser/net/url_request_string_job.h
+++ b/atom/browser/net/url_request_string_job.h
@@ -17,7 +17,7 @@ class URLRequestStringJob : public JsAsker<net::URLRequestSimpleJob> {
   URLRequestStringJob(net::URLRequest*, net::NetworkDelegate*);
 
   // JsAsker:
-  void StartAsync(scoped_ptr<base::Value> options) override;
+  void StartAsync(std::unique_ptr<base::Value> options) override;
 
   // URLRequestJob:
   void GetResponseInfo(net::HttpResponseInfo* info) override;
diff --git a/atom/browser/node_debugger.cc b/atom/browser/node_debugger.cc
index 50aa454fe757..55025dd69f72 100644
--- a/atom/browser/node_debugger.cc
+++ b/atom/browser/node_debugger.cc
@@ -145,7 +145,7 @@ void NodeDebugger::DebugMessageHandler(const v8::Debug::Message& message) {
 
 void NodeDebugger::DidAccept(
     net::test_server::StreamListenSocket* server,
-    scoped_ptr<net::test_server::StreamListenSocket> socket) {
+    std::unique_ptr<net::test_server::StreamListenSocket> socket) {
   // Only accept one session.
   if (accepted_socket_) {
     socket->Send(std::string("Remote debugging session already active"), true);
diff --git a/atom/browser/node_debugger.h b/atom/browser/node_debugger.h
index aedf7b2c0310..f708de6329f3 100644
--- a/atom/browser/node_debugger.h
+++ b/atom/browser/node_debugger.h
@@ -38,7 +38,7 @@ class NodeDebugger : public net::test_server::StreamListenSocket::Delegate {
   // net::test_server::StreamListenSocket::Delegate:
   void DidAccept(
       net::test_server::StreamListenSocket* server,
-      scoped_ptr<net::test_server::StreamListenSocket> socket) override;
+      std::unique_ptr<net::test_server::StreamListenSocket> socket) override;
   void DidRead(net::test_server::StreamListenSocket* socket,
                const char* data,
                int len) override;
@@ -49,8 +49,8 @@ class NodeDebugger : public net::test_server::StreamListenSocket::Delegate {
   uv_async_t weak_up_ui_handle_;
 
   base::Thread thread_;
-  scoped_ptr<net::test_server::StreamListenSocket> server_;
-  scoped_ptr<net::test_server::StreamListenSocket> accepted_socket_;
+  std::unique_ptr<net::test_server::StreamListenSocket> server_;
+  std::unique_ptr<net::test_server::StreamListenSocket> accepted_socket_;
 
   std::string buffer_;
   int content_length_;
diff --git a/atom/browser/ui/accelerator_util_mac.mm b/atom/browser/ui/accelerator_util_mac.mm
index d3395884c97f..e2448833ab0d 100644
--- a/atom/browser/ui/accelerator_util_mac.mm
+++ b/atom/browser/ui/accelerator_util_mac.mm
@@ -32,7 +32,7 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator) {
   NSString* characters =
       [[[NSString alloc] initWithCharacters:&character length:1] autorelease];
 
-  scoped_ptr<ui::PlatformAccelerator> platform_accelerator(
+  std::unique_ptr<ui::PlatformAccelerator> platform_accelerator(
       new ui::PlatformAcceleratorCocoa(characters, modifiers));
   accelerator->set_platform_accelerator(std::move(platform_accelerator));
 }
diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc
index 2c8b785544a2..1ad7ff5f2d41 100644
--- a/atom/browser/ui/file_dialog_gtk.cc
+++ b/atom/browser/ui/file_dialog_gtk.cc
@@ -177,7 +177,7 @@ void FileChooserDialog::AddFilters(const Filters& filters) {
     GtkFileFilter* gtk_filter = gtk_file_filter_new();
 
     for (size_t j = 0; j < filter.second.size(); ++j) {
-      scoped_ptr<std::string> file_extension(
+      std::unique_ptr<std::string> file_extension(
           new std::string("." + filter.second[j]));
       gtk_file_filter_add_custom(
           gtk_filter,
diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc
index af699a103937..5314b63a45a8 100644
--- a/atom/browser/ui/file_dialog_win.cc
+++ b/atom/browser/ui/file_dialog_win.cc
@@ -134,7 +134,7 @@ class FileDialog {
       GetPtr()->SetFolder(folder_item);
   }
 
-  scoped_ptr<T> dialog_;
+  std::unique_ptr<T> dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(FileDialog);
 };
@@ -145,7 +145,7 @@ struct RunState {
 };
 
 bool CreateDialogThread(RunState* run_state) {
-  scoped_ptr<base::Thread> thread(
+  std::unique_ptr<base::Thread> thread(
       new base::Thread(ATOM_PRODUCT_NAME "FileDialogThread"));
   thread->init_com_with_mta(false);
   if (!thread->Start())
diff --git a/atom/browser/ui/message_box_win.cc b/atom/browser/ui/message_box_win.cc
index 2c4ce54856d4..b966ef92a8fd 100644
--- a/atom/browser/ui/message_box_win.cc
+++ b/atom/browser/ui/message_box_win.cc
@@ -222,7 +222,7 @@ void ShowMessageBox(NativeWindow* parent,
                     const std::string& detail,
                     const gfx::ImageSkia& icon,
                     const MessageBoxCallback& callback) {
-  scoped_ptr<base::Thread> thread(
+  std::unique_ptr<base::Thread> thread(
       new base::Thread(ATOM_PRODUCT_NAME "MessageBoxThread"));
   thread->init_com_with_mta(false);
   if (!thread->Start()) {
diff --git a/atom/browser/ui/tray_icon_gtk.h b/atom/browser/ui/tray_icon_gtk.h
index 2be3259f218d..cfeb8ab3d0bf 100644
--- a/atom/browser/ui/tray_icon_gtk.h
+++ b/atom/browser/ui/tray_icon_gtk.h
@@ -32,7 +32,7 @@ class TrayIconGtk : public TrayIcon,
   void OnClick() override;
   bool HasClickAction() override;
 
-  scoped_ptr<views::StatusIconLinux> icon_;
+  std::unique_ptr<views::StatusIconLinux> icon_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayIconGtk);
 };
diff --git a/atom/browser/ui/views/menu_delegate.h b/atom/browser/ui/views/menu_delegate.h
index 211ddb57bc39..ad7093b48f72 100644
--- a/atom/browser/ui/views/menu_delegate.h
+++ b/atom/browser/ui/views/menu_delegate.h
@@ -52,8 +52,8 @@ class MenuDelegate : public views::MenuDelegate {
  private:
   MenuBar* menu_bar_;
   int id_;
-  scoped_ptr<views::MenuDelegate> adapter_;
-  scoped_ptr<views::MenuRunner> menu_runner_;
+  std::unique_ptr<views::MenuDelegate> adapter_;
+  std::unique_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuDelegate);
 };
diff --git a/atom/browser/ui/x/x_window_utils.cc b/atom/browser/ui/x/x_window_utils.cc
index db83753bb376..48e8bc977322 100644
--- a/atom/browser/ui/x/x_window_utils.cc
+++ b/atom/browser/ui/x/x_window_utils.cc
@@ -51,7 +51,7 @@ void SetWindowType(::Window xwindow, const std::string& type) {
 }
 
 bool ShouldUseGlobalMenuBar() {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
   if (env->HasVar("ELECTRON_FORCE_WINDOW_MENU_BAR"))
     return false;
 
@@ -61,7 +61,7 @@ bool ShouldUseGlobalMenuBar() {
   dbus::ObjectProxy* object_proxy =
       bus->GetObjectProxy(DBUS_SERVICE_DBUS, dbus::ObjectPath(DBUS_PATH_DBUS));
   dbus::MethodCall method_call(DBUS_INTERFACE_DBUS, "ListNames");
-  scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
+  std::unique_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
       &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
   if (!response) {
     bus->ShutdownAndBlock();
diff --git a/atom/browser/web_view_guest_delegate.h b/atom/browser/web_view_guest_delegate.h
index 3dae1a1749b5..d65eb1463586 100644
--- a/atom/browser/web_view_guest_delegate.h
+++ b/atom/browser/web_view_guest_delegate.h
@@ -24,10 +24,10 @@ struct SetSizeParams {
   SetSizeParams() {}
   ~SetSizeParams() {}
 
-  scoped_ptr<bool> enable_auto_size;
-  scoped_ptr<gfx::Size> min_size;
-  scoped_ptr<gfx::Size> max_size;
-  scoped_ptr<gfx::Size> normal_size;
+  std::unique_ptr<bool> enable_auto_size;
+  std::unique_ptr<gfx::Size> min_size;
+  std::unique_ptr<gfx::Size> max_size;
+  std::unique_ptr<gfx::Size> normal_size;
 };
 
 class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
diff --git a/atom/common/api/atom_api_asar.cc b/atom/common/api/atom_api_asar.cc
index 1b0ea799e7d7..97c2e47fde0d 100644
--- a/atom/common/api/atom_api_asar.cc
+++ b/atom/common/api/atom_api_asar.cc
@@ -22,7 +22,7 @@ class Archive : public mate::Wrappable<Archive> {
  public:
   static v8::Local<v8::Value> Create(v8::Isolate* isolate,
                                       const base::FilePath& path) {
-    scoped_ptr<asar::Archive> archive(new asar::Archive(path));
+    std::unique_ptr<asar::Archive> archive(new asar::Archive(path));
     if (!archive->Init())
       return v8::False(isolate);
     return (new Archive(isolate, std::move(archive)))->GetWrapper();
@@ -42,7 +42,7 @@ class Archive : public mate::Wrappable<Archive> {
   }
 
  protected:
-  Archive(v8::Isolate* isolate, scoped_ptr<asar::Archive> archive)
+  Archive(v8::Isolate* isolate, std::unique_ptr<asar::Archive> archive)
       : archive_(std::move(archive)) {
     Init(isolate);
   }
@@ -120,7 +120,7 @@ class Archive : public mate::Wrappable<Archive> {
   }
 
  private:
-  scoped_ptr<asar::Archive> archive_;
+  std::unique_ptr<asar::Archive> archive_;
 
   DISALLOW_COPY_AND_ASSIGN(Archive);
 };
diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index d5a75e3f440b..c0b51ba2af28 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -76,7 +76,7 @@ bool AddImageSkiaRep(gfx::ImageSkia* image,
                      const unsigned char* data,
                      size_t size,
                      double scale_factor) {
-  scoped_ptr<SkBitmap> decoded(new SkBitmap());
+  std::unique_ptr<SkBitmap> decoded(new SkBitmap());
 
   // Try PNG first.
   if (!gfx::PNGCodec::Decode(data, size, decoded.get()))
@@ -162,7 +162,7 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
 
 void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
   // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
-  scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
+  std::unique_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
   image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
 }
 #endif
diff --git a/atom/common/api/event_emitter_caller.cc b/atom/common/api/event_emitter_caller.cc
index 4b44553d3740..2b0de7a76161 100644
--- a/atom/common/api/event_emitter_caller.cc
+++ b/atom/common/api/event_emitter_caller.cc
@@ -17,7 +17,7 @@ v8::Local<v8::Value> CallEmitWithArgs(v8::Isolate* isolate,
                                       v8::Local<v8::Object> obj,
                                       ValueVector* args) {
   // Perform microtask checkpoint after running JavaScript.
-  scoped_ptr<blink::WebScopedRunV8Script> script_scope(
+  std::unique_ptr<blink::WebScopedRunV8Script> script_scope(
       Locker::IsBrowserProcess() ?
       nullptr : new blink::WebScopedRunV8Script);
   // Use node::MakeCallback to call the callback, and it will also run pending
diff --git a/atom/common/api/locker.h b/atom/common/api/locker.h
index 201217ff625a..e64ef1853ec5 100644
--- a/atom/common/api/locker.h
+++ b/atom/common/api/locker.h
@@ -5,7 +5,9 @@
 #ifndef ATOM_COMMON_API_LOCKER_H_
 #define ATOM_COMMON_API_LOCKER_H_
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
+#include "base/macros.h"
 #include "v8/include/v8.h"
 
 namespace mate {
@@ -24,7 +26,7 @@ class Locker {
   void* operator new(size_t size);
   void operator delete(void*, size_t);
 
-  scoped_ptr<v8::Locker> locker_;
+  std::unique_ptr<v8::Locker> locker_;
 
   DISALLOW_COPY_AND_ASSIGN(Locker);
 };
diff --git a/atom/common/asar/archive.cc b/atom/common/asar/archive.cc
index 4f04812e07e7..c2306c3c8f38 100644
--- a/atom/common/asar/archive.cc
+++ b/atom/common/asar/archive.cc
@@ -180,7 +180,7 @@ bool Archive::Init() {
 
   std::string error;
   base::JSONReader reader;
-  scoped_ptr<base::Value> value(reader.ReadToValue(header));
+  std::unique_ptr<base::Value> value(reader.ReadToValue(header));
   if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) {
     LOG(ERROR) << "Failed to parse header: " << error;
     return false;
@@ -283,7 +283,7 @@ bool Archive::CopyFileOut(const base::FilePath& path, base::FilePath* out) {
     return true;
   }
 
-  scoped_ptr<ScopedTemporaryFile> temp_file(new ScopedTemporaryFile);
+  std::unique_ptr<ScopedTemporaryFile> temp_file(new ScopedTemporaryFile);
   base::FilePath::StringType ext = path.Extension();
   if (!temp_file->InitFromFile(&file_, ext, info.offset, info.size))
     return false;
diff --git a/atom/common/asar/archive.h b/atom/common/asar/archive.h
index 79b848623c99..5438776885f3 100644
--- a/atom/common/asar/archive.h
+++ b/atom/common/asar/archive.h
@@ -72,10 +72,10 @@ class Archive {
   base::File file_;
   int fd_;
   uint32_t header_size_;
-  scoped_ptr<base::DictionaryValue> header_;
+  std::unique_ptr<base::DictionaryValue> header_;
 
   // Cached external temporary files.
-  base::ScopedPtrHashMap<base::FilePath, scoped_ptr<ScopedTemporaryFile>>
+  base::ScopedPtrHashMap<base::FilePath, std::unique_ptr<ScopedTemporaryFile>>
       external_files_;
 
   DISALLOW_COPY_AND_ASSIGN(Archive);
diff --git a/atom/common/crash_reporter/crash_reporter_linux.h b/atom/common/crash_reporter/crash_reporter_linux.h
index 165c288ab2b1..b74103ccbf76 100644
--- a/atom/common/crash_reporter/crash_reporter_linux.h
+++ b/atom/common/crash_reporter/crash_reporter_linux.h
@@ -47,7 +47,7 @@ class CrashReporterLinux : public CrashReporter {
                         void* context,
                         const bool succeeded);
 
-  scoped_ptr<google_breakpad::ExceptionHandler> breakpad_;
+  std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
   CrashKeyStorage crash_keys_;
 
   uint64_t process_start_time_;
diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h
index f03154359155..5556263cd350 100644
--- a/atom/common/crash_reporter/crash_reporter_mac.h
+++ b/atom/common/crash_reporter/crash_reporter_mac.h
@@ -45,7 +45,7 @@ class CrashReporterMac : public CrashReporter {
   std::vector<UploadReportResult> GetUploadedReports(
       const std::string& path) override;
 
-  scoped_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
+  std::unique_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
 
   DISALLOW_COPY_AND_ASSIGN(CrashReporterMac);
 };
diff --git a/atom/common/crash_reporter/crash_reporter_win.h b/atom/common/crash_reporter/crash_reporter_win.h
index 181c9eabd23c..0ab8f4bcfb19 100644
--- a/atom/common/crash_reporter/crash_reporter_win.h
+++ b/atom/common/crash_reporter/crash_reporter_win.h
@@ -62,7 +62,7 @@ class CrashReporterWin : public CrashReporter {
   google_breakpad::CustomClientInfo custom_info_;
 
   bool skip_system_crash_handler_;
-  scoped_ptr<google_breakpad::ExceptionHandler> breakpad_;
+  std::unique_ptr<google_breakpad::ExceptionHandler> breakpad_;
 
   DISALLOW_COPY_AND_ASSIGN(CrashReporterWin);
 };
diff --git a/atom/common/native_mate_converters/callback.h b/atom/common/native_mate_converters/callback.h
index 6ef8e74c735a..43a1baf25fa8 100644
--- a/atom/common/native_mate_converters/callback.h
+++ b/atom/common/native_mate_converters/callback.h
@@ -13,7 +13,6 @@
 #include "base/memory/weak_ptr.h"
 #include "native_mate/function_template.h"
 #include "native_mate/scoped_persistent.h"
-#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
 namespace mate {
 
@@ -49,9 +48,11 @@ struct V8FunctionInvoker<v8::Local<v8::Value>(ArgTypes...)> {
     v8::EscapableHandleScope handle_scope(isolate);
     if (!function.IsAlive())
       return v8::Null(isolate);
-    scoped_ptr<blink::WebScopedRunV8Script> script_scope(
+    std::unique_ptr<v8::MicrotasksScope> script_scope(
         Locker::IsBrowserProcess() ?
-        nullptr : new blink::WebScopedRunV8Script);
+            nullptr :
+            new v8::MicrotasksScope(isolate,
+                                    v8::MicrotasksScope::kRunMicrotasks));
     v8::Local<v8::Function> holder = function.NewHandle(isolate);
     v8::Local<v8::Context> context = holder->CreationContext();
     v8::Context::Scope context_scope(context);
@@ -70,9 +71,11 @@ struct V8FunctionInvoker<void(ArgTypes...)> {
     v8::HandleScope handle_scope(isolate);
     if (!function.IsAlive())
       return;
-    scoped_ptr<blink::WebScopedRunV8Script> script_scope(
+    std::unique_ptr<v8::MicrotasksScope> script_scope(
         Locker::IsBrowserProcess() ?
-        nullptr : new blink::WebScopedRunV8Script);
+            nullptr :
+            new v8::MicrotasksScope(isolate,
+                                    v8::MicrotasksScope::kRunMicrotasks));
     v8::Local<v8::Function> holder = function.NewHandle(isolate);
     v8::Local<v8::Context> context = holder->CreationContext();
     v8::Context::Scope context_scope(context);
@@ -91,9 +94,11 @@ struct V8FunctionInvoker<ReturnType(ArgTypes...)> {
     ReturnType ret = ReturnType();
     if (!function.IsAlive())
       return ret;
-    scoped_ptr<blink::WebScopedRunV8Script> script_scope(
+    std::unique_ptr<v8::MicrotasksScope> script_scope(
         Locker::IsBrowserProcess() ?
-        nullptr : new blink::WebScopedRunV8Script);
+            nullptr :
+            new v8::MicrotasksScope(isolate,
+                                    v8::MicrotasksScope::kRunMicrotasks));
     v8::Local<v8::Function> holder = function.NewHandle(isolate);
     v8::Local<v8::Context> context = holder->CreationContext();
     v8::Context::Scope context_scope(context);
diff --git a/atom/common/native_mate_converters/content_converter.cc b/atom/common/native_mate_converters/content_converter.cc
index b672f946cb6c..824065882e82 100644
--- a/atom/common/native_mate_converters/content_converter.cc
+++ b/atom/common/native_mate_converters/content_converter.cc
@@ -121,18 +121,18 @@ v8::Local<v8::Value> Converter<ContextMenuParamsWithWebContents>::ToV8(
 }
 
 // static
-bool Converter<content::PermissionStatus>::FromV8(
+bool Converter<blink::mojom::PermissionStatus>::FromV8(
     v8::Isolate* isolate,
     v8::Local<v8::Value> val,
-    content::PermissionStatus* out) {
+    blink::mojom::PermissionStatus* out) {
   bool result;
   if (!ConvertFromV8(isolate, val, &result))
     return false;
 
   if (result)
-    *out = content::PermissionStatus::GRANTED;
+    *out = blink::mojom::PermissionStatus::GRANTED;
   else
-    *out = content::PermissionStatus::DENIED;
+    *out = blink::mojom::PermissionStatus::DENIED;
 
   return true;
 }
diff --git a/atom/common/native_mate_converters/content_converter.h b/atom/common/native_mate_converters/content_converter.h
index f2e7211ce5d1..522961a7e96c 100644
--- a/atom/common/native_mate_converters/content_converter.h
+++ b/atom/common/native_mate_converters/content_converter.h
@@ -9,8 +9,8 @@
 
 #include "content/public/browser/permission_type.h"
 #include "content/public/common/menu_item.h"
-#include "content/public/common/permission_status.mojom.h"
 #include "content/public/common/stop_find_action.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 #include "native_mate/converter.h"
 
 namespace content {
@@ -36,9 +36,9 @@ struct Converter<ContextMenuParamsWithWebContents> {
 };
 
 template<>
-struct Converter<content::PermissionStatus> {
+struct Converter<blink::mojom::PermissionStatus> {
   static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
-                     content::PermissionStatus* out);
+                     blink::mojom::PermissionStatus* out);
 };
 
 template<>
diff --git a/atom/common/native_mate_converters/net_converter.cc b/atom/common/native_mate_converters/net_converter.cc
index 5223709ae585..772ae6e22087 100644
--- a/atom/common/native_mate_converters/net_converter.cc
+++ b/atom/common/native_mate_converters/net_converter.cc
@@ -25,13 +25,13 @@ namespace mate {
 // static
 v8::Local<v8::Value> Converter<const net::URLRequest*>::ToV8(
     v8::Isolate* isolate, const net::URLRequest* val) {
-  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
   dict->SetString("method", val->method());
   std::string url;
   if (!val->url_chain().empty()) url = val->url().spec();
   dict->SetStringWithoutPathExpansion("url", url);
   dict->SetString("referrer", val->referrer());
-  scoped_ptr<base::ListValue> list(new base::ListValue);
+  std::unique_ptr<base::ListValue> list(new base::ListValue);
   atom::GetUploadData(list.get(), val);
   if (!list->empty())
     dict->Set("uploadData", std::move(list));
@@ -74,15 +74,15 @@ void GetUploadData(base::ListValue* upload_data_list,
   const net::UploadDataStream* upload_data = request->get_upload();
   if (!upload_data)
     return;
-  const std::vector<scoped_ptr<net::UploadElementReader>>* readers =
+  const std::vector<std::unique_ptr<net::UploadElementReader>>* readers =
       upload_data->GetElementReaders();
   for (const auto& reader : *readers) {
-    scoped_ptr<base::DictionaryValue> upload_data_dict(
+    std::unique_ptr<base::DictionaryValue> upload_data_dict(
         new base::DictionaryValue);
     if (reader->AsBytesReader()) {
       const net::UploadBytesElementReader* bytes_reader =
           reader->AsBytesReader();
-      scoped_ptr<base::Value> bytes(
+      std::unique_ptr<base::Value> bytes(
           base::BinaryValue::CreateWithCopiedBuffer(bytes_reader->bytes(),
                                                     bytes_reader->length()));
       upload_data_dict->Set("bytes", std::move(bytes));
diff --git a/atom/common/native_mate_converters/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc
index 99873cd1c4f0..13df524c34e5 100644
--- a/atom/common/native_mate_converters/v8_value_converter.cc
+++ b/atom/common/native_mate_converters/v8_value_converter.cc
@@ -288,7 +288,7 @@ base::Value* V8ValueConverter::FromV8Array(
   if (!state->UpdateAndCheckUniqueness(val))
     return base::Value::CreateNullValue().release();
 
-  scoped_ptr<v8::Context::Scope> scope;
+  std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
   if (!val->CreationContext().IsEmpty() &&
@@ -335,14 +335,14 @@ base::Value* V8ValueConverter::FromV8Object(
   if (!state->UpdateAndCheckUniqueness(val))
     return base::Value::CreateNullValue().release();
 
-  scoped_ptr<v8::Context::Scope> scope;
+  std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
   if (!val->CreationContext().IsEmpty() &&
       val->CreationContext() != isolate->GetCurrentContext())
     scope.reset(new v8::Context::Scope(val->CreationContext()));
 
-  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   v8::Local<v8::Array> property_names(val->GetOwnPropertyNames());
 
   for (uint32_t i = 0; i < property_names->Length(); ++i) {
@@ -371,7 +371,7 @@ base::Value* V8ValueConverter::FromV8Object(
       child_v8 = v8::Null(isolate);
     }
 
-    scoped_ptr<base::Value> child(FromV8ValueImpl(state, child_v8, isolate));
+    std::unique_ptr<base::Value> child(FromV8ValueImpl(state, child_v8, isolate));
     if (!child.get())
       // JSON.stringify skips properties whose values don't serialize, for
       // example undefined and functions. Emulate that behavior.
diff --git a/atom/common/native_mate_converters/value_converter.cc b/atom/common/native_mate_converters/value_converter.cc
index c9c1a861ba26..c3c7ae0383c5 100644
--- a/atom/common/native_mate_converters/value_converter.cc
+++ b/atom/common/native_mate_converters/value_converter.cc
@@ -12,8 +12,8 @@ namespace mate {
 bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
                                               v8::Local<v8::Value> val,
                                               base::DictionaryValue* out) {
-  scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
-  scoped_ptr<base::Value> value(converter->FromV8Value(
+  std::unique_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
+  std::unique_ptr<base::Value> value(converter->FromV8Value(
       val, isolate->GetCurrentContext()));
   if (value && value->IsType(base::Value::TYPE_DICTIONARY)) {
     out->Swap(static_cast<base::DictionaryValue*>(value.get()));
@@ -26,15 +26,15 @@ bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
 v8::Local<v8::Value> Converter<base::DictionaryValue>::ToV8(
     v8::Isolate* isolate,
     const base::DictionaryValue& val) {
-  scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
+  std::unique_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
   return converter->ToV8Value(&val, isolate->GetCurrentContext());
 }
 
 bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
                                         v8::Local<v8::Value> val,
                                         base::ListValue* out) {
-  scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
-  scoped_ptr<base::Value> value(converter->FromV8Value(
+  std::unique_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
+  std::unique_ptr<base::Value> value(converter->FromV8Value(
       val, isolate->GetCurrentContext()));
   if (value->IsType(base::Value::TYPE_LIST)) {
     out->Swap(static_cast<base::ListValue*>(value.get()));
@@ -47,7 +47,7 @@ bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
 v8::Local<v8::Value> Converter<base::ListValue>::ToV8(
     v8::Isolate* isolate,
     const base::ListValue& val) {
-  scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
+  std::unique_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
   return converter->ToV8Value(&val, isolate->GetCurrentContext());
 }
 
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index b3c36fdd8e03..561f0085a186 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -79,9 +79,9 @@ void UvNoOp(uv_async_t* handle) {
 // Convert the given vector to an array of C-strings. The strings in the
 // returned vector are only guaranteed valid so long as the vector of strings
 // is not modified.
-scoped_ptr<const char*[]> StringVectorToArgArray(
+std::unique_ptr<const char*[]> StringVectorToArgArray(
     const std::vector<std::string>& vector) {
-  scoped_ptr<const char*[]> array(new const char*[vector.size()]);
+  std::unique_ptr<const char*[]> array(new const char*[vector.size()]);
   for (size_t i = 0; i < vector.size(); ++i) {
     array[i] = vector[i].c_str();
   }
@@ -146,7 +146,7 @@ void NodeBindings::Initialize() {
 #if defined(OS_WIN)
   // uv_init overrides error mode to suppress the default crash dialog, bring
   // it back if user wants to show it.
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
   if (env->HasVar("ELECTRON_DEFAULT_ERROR_MODE"))
     SetErrorMode(0);
 #endif
@@ -167,7 +167,7 @@ node::Environment* NodeBindings::CreateEnvironment(
   std::string script_path_str = script_path.AsUTF8Unsafe();
   args.insert(args.begin() + 1, script_path_str.c_str());
 
-  scoped_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
+  std::unique_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
   node::Environment* env = node::CreateEnvironment(
       context->GetIsolate(), uv_default_loop(), context,
       args.size(), c_argv.get(), 0, nullptr);
@@ -226,7 +226,7 @@ void NodeBindings::UvRunOnce() {
   v8::Context::Scope context_scope(env->context());
 
   // Perform microtask checkpoint after running JavaScript.
-  scoped_ptr<blink::WebScopedRunV8Script> script_scope(
+  std::unique_ptr<blink::WebScopedRunV8Script> script_scope(
       is_browser_ ? nullptr : new blink::WebScopedRunV8Script);
 
   // Deal with uv events.
diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
index d32b5f1c8c46..0b291d3b552a 100644
--- a/atom/renderer/api/atom_api_web_frame.cc
+++ b/atom/renderer/api/atom_api_web_frame.cc
@@ -158,7 +158,7 @@ void WebFrame::ExecuteJavaScript(const base::string16& code,
   args->GetNext(&has_user_gesture);
   ScriptExecutionCallback::CompletionCallback completion_callback;
   args->GetNext(&completion_callback);
-  scoped_ptr<blink::WebScriptExecutionCallback> callback(
+  std::unique_ptr<blink::WebScriptExecutionCallback> callback(
       new ScriptExecutionCallback(completion_callback));
   web_frame_->requestExecuteScriptAndReturnValue(
       blink::WebScriptSource(code),
diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h
index 2e120ecb6ae3..df0392a933e0 100644
--- a/atom/renderer/api/atom_api_web_frame.h
+++ b/atom/renderer/api/atom_api_web_frame.h
@@ -74,7 +74,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
   blink::WebCache::ResourceTypeStats GetResourceUsage(v8::Isolate* isolate);
   void ClearCache(v8::Isolate* isolate);
 
-  scoped_ptr<SpellCheckClient> spell_check_client_;
+  std::unique_ptr<SpellCheckClient> spell_check_client_;
 
   blink::WebLocalFrame* web_frame_;
 
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index aa93f63aa2bb..5613f20d2ecc 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -95,15 +95,11 @@ AtomRendererClient::AtomRendererClient()
 AtomRendererClient::~AtomRendererClient() {
 }
 
-void AtomRendererClient::WebKitInitialized() {
+void AtomRendererClient::RenderThreadStarted() {
   blink::WebCustomElement::addEmbedderCustomElementName("webview");
   blink::WebCustomElement::addEmbedderCustomElementName("browserplugin");
 
   OverrideNodeArrayBuffer();
-}
-
-void AtomRendererClient::RenderThreadStarted() {
-  content::RenderThread::Get()->AddObserver(this);
 
 #if defined(OS_WIN)
   // Set ApplicationUserModelID in renderer process.
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 11d6028928a0..16b975fd41f7 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -9,15 +9,13 @@
 #include <vector>
 
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/public/renderer/render_process_observer.h"
 
 namespace atom {
 
 class AtomBindings;
 class NodeBindings;
 
-class AtomRendererClient : public content::ContentRendererClient,
-                           public content::RenderProcessObserver {
+class AtomRendererClient : public content::ContentRendererClient {
  public:
   AtomRendererClient();
   virtual ~AtomRendererClient();
@@ -33,9 +31,6 @@ class AtomRendererClient : public content::ContentRendererClient,
     DISABLE,
   };
 
-  // content::RenderProcessObserver:
-  void WebKitInitialized() override;
-
   // content::ContentRendererClient:
   void RenderThreadStarted() override;
   void RenderFrameCreated(content::RenderFrame*) override;
@@ -64,8 +59,8 @@ class AtomRendererClient : public content::ContentRendererClient,
                                  std::string* error_html,
                                  base::string16* error_description) override;
 
-  scoped_ptr<NodeBindings> node_bindings_;
-  scoped_ptr<AtomBindings> atom_bindings_;
+  std::unique_ptr<NodeBindings> node_bindings_;
+  std::unique_ptr<AtomBindings> atom_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
 };
diff --git a/vendor/brightray b/vendor/brightray
index 477290bfa105..3f18ef50c26a 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 477290bfa105053719a2de5f42089eb8ba261713
+Subproject commit 3f18ef50c26a6cea42845292abe076fb627f5ef1

From de27b34891818e4a01913e62bacafd9a853cbe1a Mon Sep 17 00:00:00 2001
From: leethomas <leet944@gmail.com>
Date: Sun, 22 May 2016 19:09:21 -0700
Subject: [PATCH 329/510] disregard extraSize when initially setting the aspect
 ratio

---
 atom/browser/native_window_mac.mm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 0f52adf30b6d..d6571be826d1 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -714,21 +714,8 @@ void NativeWindowMac::SetAspectRatio(double aspect_ratio,
     // it as a float, and Cocoa expects an NSRect with explicit width & height
     // arguments. Instead we derive those args ourselves from the given aspect
     // ratio.
-
-    gfx::Size windowSize = this->GetSize();
-    gfx::Size contentSize = this->GetContentSize();
-
-    double extraWidthPlusFrame =
-        windowSize.width() - contentSize.width() + extra_size.width();
-    double extraHeightPlusFrame =
-        windowSize.height() - contentSize.height() + extra_size.height();
-
-    double width =
-        roundf(([window_ frame].size.height - extraHeightPlusFrame) *
-        aspect_ratio + extraWidthPlusFrame);
-    double height =
-        roundf((width - extraWidthPlusFrame) /
-        aspect_ratio + extraHeightPlusFrame);
+    double width = roundf([window_ frame].size.height * aspect_ratio);
+    double height = roundf(width / aspect_ratio);
 
     [window_ setAspectRatio:NSMakeSize(width, height)];
 }

From a2bd55dd3c381ad44ac56b89938deaa281c17205 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 12:28:59 +0900
Subject: [PATCH 330/510] Adapt to changes of Chrome 51 API changes (Part 2)

---
 atom/browser/api/atom_api_session.cc          |  2 +-
 atom/browser/api/atom_api_web_contents.cc     |  5 ++-
 atom/browser/atom_browser_client.cc           |  3 +-
 .../browser/atom_javascript_dialog_manager.cc |  2 +-
 atom/browser/login_handler.cc                 |  9 +++--
 .../browser/web_contents_permission_helper.cc |  4 +-
 atom/common/api/event_emitter_caller.cc       |  7 ++--
 atom/common/node_bindings.cc                  |  7 ++--
 chromium_src/chrome/browser/browser_process.h |  2 +-
 .../browser/certificate_manager_model.cc      |  2 +-
 .../browser/certificate_manager_model.h       |  2 +-
 .../extensions/global_shortcut_listener_win.h |  2 +-
 .../media/native_desktop_media_list.cc        | 20 +++++-----
 .../browser/media/native_desktop_media_list.h | 10 ++---
 .../browser/printing/pdf_to_emf_converter.cc  |  8 ++--
 .../browser/printing/pdf_to_emf_converter.h   |  4 +-
 .../chrome/browser/printing/print_job.cc      |  8 ++--
 .../chrome/browser/printing/print_job.h       |  6 +--
 .../browser/printing/print_job_worker.cc      | 40 ++++++++-----------
 .../browser/printing/print_job_worker.h       |  8 ++--
 .../printing/print_preview_message_handler.cc |  2 +-
 .../printing/print_view_manager_base.cc       |  2 +-
 .../chrome/browser/printing/printer_query.cc  |  2 +-
 .../chrome/browser/printing/printer_query.h   |  4 +-
 .../printing/printing_message_filter.cc       |  2 +-
 .../chrome_browser_pepper_host_factory.cc     | 18 ++++-----
 .../chrome_browser_pepper_host_factory.h      |  4 +-
 .../chrome/browser/speech/tts_controller.h    |  2 +-
 .../chrome/browser/speech/tts_linux.cc        |  2 +-
 .../browser/speech/tts_message_filter.cc      |  2 +-
 .../chrome/common/chrome_paths_linux.cc       |  4 +-
 .../chrome/common/chrome_paths_mac.mm         |  4 +-
 .../chrome_renderer_pepper_host_factory.cc    | 14 +++----
 .../chrome_renderer_pepper_host_factory.h     |  3 +-
 .../pepper/pepper_flash_renderer_host.cc      |  4 +-
 .../chrome/renderer/pepper/pepper_helper.cc   |  4 +-
 .../pepper_shared_memory_message_filter.cc    |  2 +-
 .../printing/print_web_view_helper.cc         |  2 +-
 .../renderer/printing/print_web_view_helper.h |  8 ++--
 .../printing/print_web_view_helper_linux.cc   |  2 +-
 .../printing/print_web_view_helper_mac.mm     |  2 +-
 .../printing/print_web_view_helper_pdf_win.cc |  2 +-
 .../spellchecker/spellcheck_worditerator.cc   |  2 +-
 .../spellchecker/spellcheck_worditerator.h    |  2 +-
 .../stream_listen_socket.h                    |  4 +-
 .../embedded_test_server/tcp_listen_socket.cc |  8 ++--
 .../embedded_test_server/tcp_listen_socket.h  |  2 +-
 vendor/brightray                              |  2 +-
 48 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
index 2e6ff448ce9b..61b34e1de9cc 100644
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -190,7 +190,7 @@ class ResolveProxyHelper {
 
     // Start the request.
     int result = proxy_service->ResolveProxy(
-        url, net::LOAD_NORMAL, &proxy_info_, completion_callback,
+        url, "GET", net::LOAD_NORMAL, &proxy_info_, completion_callback,
         &pac_req_, nullptr, net::BoundNetLog());
 
     // Completed synchronously.
diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 2298a7b5ec18..72e87c30a8c7 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -261,8 +261,9 @@ WebContents::WebContents(v8::Isolate* isolate,
 
   content::WebContents* web_contents;
   if (is_guest) {
-    content::SiteInstance* site_instance = content::SiteInstance::CreateForURL(
-        session->browser_context(), GURL("chrome-guest://fake-host"));
+    scoped_refptr<content::SiteInstance> site_instance =
+        content::SiteInstance::CreateForURL(
+            session->browser_context(), GURL("chrome-guest://fake-host"));
     content::WebContents::CreateParams params(
         session->browser_context(), site_instance);
     guest_delegate_.reset(new WebViewGuestDelegate);
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 5fab9c60d1e9..c2ee2096ee9e 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -129,7 +129,8 @@ void AtomBrowserClient::OverrideSiteInstanceForNavigation(
   if (url.SchemeIs(url::kJavaScriptScheme))
     return;
 
-  *new_instance = content::SiteInstance::CreateForURL(browser_context, url);
+  *new_instance =
+      content::SiteInstance::CreateForURL(browser_context, url).get();
 
   // Remember the original renderer process of the pending renderer process.
   auto current_process = current_instance->GetProcess();
diff --git a/atom/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc
index e1299821f5e4..07f3ea69bb7e 100644
--- a/atom/browser/atom_javascript_dialog_manager.cc
+++ b/atom/browser/atom_javascript_dialog_manager.cc
@@ -26,7 +26,7 @@ void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
     bool is_reload,
     const DialogClosedCallback& callback) {
   // FIXME(zcbenz): the |message_text| is removed, figure out what should we do.
-  callback.Run(true);
+  callback.Run(true, base::ASCIIToUTF16("FIXME"));
 }
 
 }  // namespace atom
diff --git a/atom/browser/login_handler.cc b/atom/browser/login_handler.cc
index 7a1a77cc2b13..1a6c6947b617 100644
--- a/atom/browser/login_handler.cc
+++ b/atom/browser/login_handler.cc
@@ -37,10 +37,11 @@ LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info,
       render_frame_id_(0) {
   content::ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderFrame(
       &render_process_host_id_,  &render_frame_id_);
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                          base::Bind(&Browser::RequestLogin,
-                                     base::Unretained(Browser::Get()),
-                                     make_scoped_refptr(this)));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&Browser::RequestLogin,
+                 base::Unretained(Browser::Get()),
+                 base::RetainedRef(make_scoped_refptr(this))));
 }
 
 LoginHandler::~LoginHandler() {
diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc
index 83274591e71e..73405b571934 100644
--- a/atom/browser/web_contents_permission_helper.cc
+++ b/atom/browser/web_contents_permission_helper.cc
@@ -34,8 +34,8 @@ void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
 }
 
 void OnPermissionResponse(const base::Callback<void(bool)>& callback,
-                          content::PermissionStatus status) {
-  if (status == content::PermissionStatus::GRANTED)
+                          blink::mojom::PermissionStatus status) {
+  if (status == blink::mojom::PermissionStatus::GRANTED)
     callback.Run(true);
   else
     callback.Run(false);
diff --git a/atom/common/api/event_emitter_caller.cc b/atom/common/api/event_emitter_caller.cc
index 2b0de7a76161..271ea705e09c 100644
--- a/atom/common/api/event_emitter_caller.cc
+++ b/atom/common/api/event_emitter_caller.cc
@@ -7,7 +7,6 @@
 #include "atom/common/api/locker.h"
 #include "atom/common/node_includes.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
 namespace mate {
 
@@ -17,9 +16,11 @@ v8::Local<v8::Value> CallEmitWithArgs(v8::Isolate* isolate,
                                       v8::Local<v8::Object> obj,
                                       ValueVector* args) {
   // Perform microtask checkpoint after running JavaScript.
-  std::unique_ptr<blink::WebScopedRunV8Script> script_scope(
+  std::unique_ptr<v8::MicrotasksScope> script_scope(
       Locker::IsBrowserProcess() ?
-      nullptr : new blink::WebScopedRunV8Script);
+          nullptr :
+          new v8::MicrotasksScope(isolate,
+                                  v8::MicrotasksScope::kRunMicrotasks));
   // Use node::MakeCallback to call the callback, and it will also run pending
   // tasks in Node.js.
   return node::MakeCallback(
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index 561f0085a186..a55620557e56 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -21,7 +21,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_paths.h"
 #include "native_mate/dictionary.h"
-#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
 using content::BrowserThread;
 
@@ -226,8 +225,10 @@ void NodeBindings::UvRunOnce() {
   v8::Context::Scope context_scope(env->context());
 
   // Perform microtask checkpoint after running JavaScript.
-  std::unique_ptr<blink::WebScopedRunV8Script> script_scope(
-      is_browser_ ? nullptr : new blink::WebScopedRunV8Script);
+  std::unique_ptr<v8::MicrotasksScope> script_scope(is_browser_ ?
+      nullptr :
+      new v8::MicrotasksScope(env->isolate(),
+                              v8::MicrotasksScope::kRunMicrotasks));
 
   // Deal with uv events.
   int r = uv_run(uv_loop_, UV_RUN_NOWAIT);
diff --git a/chromium_src/chrome/browser/browser_process.h b/chromium_src/chrome/browser/browser_process.h
index 8baa899f7ada..53ec0ba75f1c 100644
--- a/chromium_src/chrome/browser/browser_process.h
+++ b/chromium_src/chrome/browser/browser_process.h
@@ -31,7 +31,7 @@ class BrowserProcess {
   printing::PrintJobManager* print_job_manager();
 
  private:
-  scoped_ptr<printing::PrintJobManager> print_job_manager_;
+  std::unique_ptr<printing::PrintJobManager> print_job_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcess);
 };
diff --git a/chromium_src/chrome/browser/certificate_manager_model.cc b/chromium_src/chrome/browser/certificate_manager_model.cc
index b0db6edc357c..2274c09e3415 100644
--- a/chromium_src/chrome/browser/certificate_manager_model.cc
+++ b/chromium_src/chrome/browser/certificate_manager_model.cc
@@ -138,7 +138,7 @@ void CertificateManagerModel::DidGetCertDBOnUIThread(
     const CreationCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  scoped_ptr<CertificateManagerModel> model(new CertificateManagerModel(
+  std::unique_ptr<CertificateManagerModel> model(new CertificateManagerModel(
       cert_db, is_user_db_available));
   callback.Run(std::move(model));
 }
diff --git a/chromium_src/chrome/browser/certificate_manager_model.h b/chromium_src/chrome/browser/certificate_manager_model.h
index 1eb350876803..81c3b6c8a8d1 100644
--- a/chromium_src/chrome/browser/certificate_manager_model.h
+++ b/chromium_src/chrome/browser/certificate_manager_model.h
@@ -24,7 +24,7 @@ class ResourceContext;
 // manager dialog, and processes changes from the view.
 class CertificateManagerModel {
  public:
-  typedef base::Callback<void(scoped_ptr<CertificateManagerModel>)>
+  typedef base::Callback<void(std::unique_ptr<CertificateManagerModel>)>
       CreationCallback;
 
   // Creates a CertificateManagerModel. The model will be passed to the callback
diff --git a/chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h b/chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
index b3917e9a160e..1999e0e7747b 100644
--- a/chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
+++ b/chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h
@@ -41,7 +41,7 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener {
   typedef std::map<ui::Accelerator, int> HotkeyIdMap;
   HotkeyIdMap hotkey_ids_;
 
-  scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
+  std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerWin);
 };
diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc
index 3c1848df3ef9..a524dfcf38cb 100644
--- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc
+++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc
@@ -39,7 +39,7 @@ uint32_t GetFrameHash(webrtc::DesktopFrame* frame) {
   return base::SuperFastHash(reinterpret_cast<char*>(frame->data()), data_size);
 }
 
-gfx::ImageSkia ScaleDesktopFrame(scoped_ptr<webrtc::DesktopFrame> frame,
+gfx::ImageSkia ScaleDesktopFrame(std::unique_ptr<webrtc::DesktopFrame> frame,
                                  gfx::Size size) {
   gfx::Rect scaled_rect = media::ComputeLetterboxRegion(
       gfx::Rect(0, 0, size.width(), size.height()),
@@ -86,8 +86,8 @@ class NativeDesktopMediaList::Worker
     : public webrtc::DesktopCapturer::Callback {
  public:
   Worker(base::WeakPtr<NativeDesktopMediaList> media_list,
-         scoped_ptr<webrtc::ScreenCapturer> screen_capturer,
-         scoped_ptr<webrtc::WindowCapturer> window_capturer);
+         std::unique_ptr<webrtc::ScreenCapturer> screen_capturer,
+         std::unique_ptr<webrtc::WindowCapturer> window_capturer);
   ~Worker() override;
 
   void Refresh(const gfx::Size& thumbnail_size,
@@ -102,10 +102,10 @@ class NativeDesktopMediaList::Worker
 
   base::WeakPtr<NativeDesktopMediaList> media_list_;
 
-  scoped_ptr<webrtc::ScreenCapturer> screen_capturer_;
-  scoped_ptr<webrtc::WindowCapturer> window_capturer_;
+  std::unique_ptr<webrtc::ScreenCapturer> screen_capturer_;
+  std::unique_ptr<webrtc::WindowCapturer> window_capturer_;
 
-  scoped_ptr<webrtc::DesktopFrame> current_frame_;
+  std::unique_ptr<webrtc::DesktopFrame> current_frame_;
 
   ImageHashesMap image_hashes_;
 
@@ -114,8 +114,8 @@ class NativeDesktopMediaList::Worker
 
 NativeDesktopMediaList::Worker::Worker(
     base::WeakPtr<NativeDesktopMediaList> media_list,
-    scoped_ptr<webrtc::ScreenCapturer> screen_capturer,
-    scoped_ptr<webrtc::WindowCapturer> window_capturer)
+    std::unique_ptr<webrtc::ScreenCapturer> screen_capturer,
+    std::unique_ptr<webrtc::WindowCapturer> window_capturer)
     : media_list_(media_list),
       screen_capturer_(std::move(screen_capturer)),
       window_capturer_(std::move(window_capturer)) {
@@ -229,8 +229,8 @@ void NativeDesktopMediaList::Worker::OnCaptureCompleted(
 }
 
 NativeDesktopMediaList::NativeDesktopMediaList(
-    scoped_ptr<webrtc::ScreenCapturer> screen_capturer,
-    scoped_ptr<webrtc::WindowCapturer> window_capturer)
+    std::unique_ptr<webrtc::ScreenCapturer> screen_capturer,
+    std::unique_ptr<webrtc::WindowCapturer> window_capturer)
     : screen_capturer_(std::move(screen_capturer)),
       window_capturer_(std::move(window_capturer)),
       update_period_(base::TimeDelta::FromMilliseconds(kDefaultUpdatePeriod)),
diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.h b/chromium_src/chrome/browser/media/native_desktop_media_list.h
index f789a368be90..803243979801 100644
--- a/chromium_src/chrome/browser/media/native_desktop_media_list.h
+++ b/chromium_src/chrome/browser/media/native_desktop_media_list.h
@@ -25,8 +25,8 @@ class NativeDesktopMediaList : public DesktopMediaList {
   // types of sources the model should be populated with (e.g. it will only
   // contain windows, if |screen_capturer| is NULL).
   NativeDesktopMediaList(
-      scoped_ptr<webrtc::ScreenCapturer> screen_capturer,
-      scoped_ptr<webrtc::WindowCapturer> window_capturer);
+      std::unique_ptr<webrtc::ScreenCapturer> screen_capturer,
+      std::unique_ptr<webrtc::WindowCapturer> window_capturer);
   ~NativeDesktopMediaList() override;
 
   // DesktopMediaList interface.
@@ -66,8 +66,8 @@ class NativeDesktopMediaList : public DesktopMediaList {
   void OnRefreshFinished();
 
   // Capturers specified in SetCapturers() and passed to the |worker_| later.
-  scoped_ptr<webrtc::ScreenCapturer> screen_capturer_;
-  scoped_ptr<webrtc::WindowCapturer> window_capturer_;
+  std::unique_ptr<webrtc::ScreenCapturer> screen_capturer_;
+  std::unique_ptr<webrtc::WindowCapturer> window_capturer_;
 
   // Time interval between mode updates.
   base::TimeDelta update_period_;
@@ -87,7 +87,7 @@ class NativeDesktopMediaList : public DesktopMediaList {
   // An object that does all the work of getting list of sources on a background
   // thread (see |capture_task_runner_|). Destroyed on |capture_task_runner_|
   // after the model is destroyed.
-  scoped_ptr<Worker> worker_;
+  std::unique_ptr<Worker> worker_;
 
   // Current list of sources.
   std::vector<Source> sources_;
diff --git a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
index 5d42264144a5..49a99f4af096 100644
--- a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -48,7 +48,7 @@ class RefCountedTempDir
   DISALLOW_COPY_AND_ASSIGN(RefCountedTempDir);
 };
 
-typedef scoped_ptr<base::File, BrowserThread::DeleteOnFileThread>
+typedef std::unique_ptr<base::File, BrowserThread::DeleteOnFileThread>
     ScopedTempFile;
 
 // Wrapper for Emf to keep only file handle in memory, and load actual data only
@@ -389,7 +389,7 @@ void PdfToEmfUtilityProcessHostClient::OnPageDone(bool success,
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (get_page_callbacks_.empty())
     return OnFailed();
-  scoped_ptr<MetafilePlayer> emf;
+  std::unique_ptr<MetafilePlayer> emf;
   GetPageCallbackData& data = get_page_callbacks_.front();
   if (success)
     emf.reset(new LazyEmf(temp_dir_, data.emf().Pass()));
@@ -487,8 +487,8 @@ PdfToEmfConverter::~PdfToEmfConverter() {
 }
 
 // static
-scoped_ptr<PdfToEmfConverter> PdfToEmfConverter::CreateDefault() {
-  return scoped_ptr<PdfToEmfConverter>(new PdfToEmfConverterImpl());
+std::unique_ptr<PdfToEmfConverter> PdfToEmfConverter::CreateDefault() {
+  return std::unique_ptr<PdfToEmfConverter>(new PdfToEmfConverterImpl());
 }
 
 }  // namespace printing
diff --git a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.h b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.h
index 60fdbc4b7e4e..859d42293135 100644
--- a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.h
+++ b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.h
@@ -23,11 +23,11 @@ class PdfToEmfConverter {
   typedef base::Callback<void(int page_count)> StartCallback;
   typedef base::Callback<void(int page_number,
                               float scale_factor,
-                              scoped_ptr<MetafilePlayer> emf)> GetPageCallback;
+                              std::unique_ptr<MetafilePlayer> emf)> GetPageCallback;
 
   virtual ~PdfToEmfConverter();
 
-  static scoped_ptr<PdfToEmfConverter> CreateDefault();
+  static std::unique_ptr<PdfToEmfConverter> CreateDefault();
 
   // Starts conversion of PDF provided as |data|. Calls |start_callback|
   // with positive |page_count|. |page_count| is 0 if initialization failed.
diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc
index 60dcebe08033..eeca453030ea 100644
--- a/chromium_src/chrome/browser/printing/print_job.cc
+++ b/chromium_src/chrome/browser/printing/print_job.cc
@@ -133,7 +133,7 @@ void PrintJob::StartPrinting() {
                                make_scoped_refptr(this),
                                base::Bind(&PrintJobWorker::StartPrinting,
                                           base::Unretained(worker_.get()),
-                                          document_)));
+                                          base::RetainedRef(document_))));
   // Set the flag right now.
   is_job_pending_ = true;
 
@@ -267,7 +267,7 @@ class PrintJob::PdfToEmfState {
   int pages_in_progress_;
   gfx::Size page_size_;
   gfx::Rect content_area_;
-  scoped_ptr<PdfToEmfConverter> converter_;
+  std::unique_ptr<PdfToEmfConverter> converter_;
 };
 
 void PrintJob::StartPdfToEmfConversion(
@@ -296,7 +296,7 @@ void PrintJob::OnPdfToEmfStarted(int page_count) {
 
 void PrintJob::OnPdfToEmfPageConverted(int page_number,
                                        float scale_factor,
-                                       scoped_ptr<MetafilePlayer> emf) {
+                                       std::unique_ptr<MetafilePlayer> emf) {
   DCHECK(ptd_to_emf_state_);
   if (!document_.get() || !emf) {
     ptd_to_emf_state_.reset();
@@ -335,7 +335,7 @@ void PrintJob::UpdatePrintedDocument(PrintedDocument* new_document) {
                                  make_scoped_refptr(this),
                                  base::Bind(&PrintJobWorker::OnDocumentChanged,
                                             base::Unretained(worker_.get()),
-                                            document_)));
+                                            base::RetainedRef(document_))));
   }
 }
 
diff --git a/chromium_src/chrome/browser/printing/print_job.h b/chromium_src/chrome/browser/printing/print_job.h
index 4963a94f14f5..5569f87679f7 100644
--- a/chromium_src/chrome/browser/printing/print_job.h
+++ b/chromium_src/chrome/browser/printing/print_job.h
@@ -98,7 +98,7 @@ class PrintJob : public PrintJobWorkerOwner,
   void OnPdfToEmfStarted(int page_count);
   void OnPdfToEmfPageConverted(int page_number,
                                float scale_factor,
-                               scoped_ptr<MetafilePlayer> emf);
+                               std::unique_ptr<MetafilePlayer> emf);
 
 #endif  // OS_WIN
 
@@ -134,7 +134,7 @@ class PrintJob : public PrintJobWorkerOwner,
   // All the UI is done in a worker thread because many Win32 print functions
   // are blocking and enters a message loop without your consent. There is one
   // worker thread per print job.
-  scoped_ptr<PrintJobWorker> worker_;
+  std::unique_ptr<PrintJobWorker> worker_;
 
   // Cache of the print context settings for access in the UI thread.
   PrintSettings settings_;
@@ -151,7 +151,7 @@ class PrintJob : public PrintJobWorkerOwner,
 
 #if defined(OS_WIN)
   class PdfToEmfState;
-  scoped_ptr<PdfToEmfState> ptd_to_emf_state_;
+  std::unique_ptr<PdfToEmfState> ptd_to_emf_state_;
 #endif  // OS_WIN
 
   // Used at shutdown so that we can quit a nested message loop.
diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc
index 889ad6d2523f..7a88a8570c42 100644
--- a/chromium_src/chrome/browser/printing/print_job_worker.cc
+++ b/chromium_src/chrome/browser/printing/print_job_worker.cc
@@ -146,7 +146,7 @@ void PrintJobWorker::GetSettings(
 }
 
 void PrintJobWorker::SetSettings(
-    scoped_ptr<base::DictionaryValue> new_settings) {
+    std::unique_ptr<base::DictionaryValue> new_settings) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   BrowserThread::PostTask(
@@ -160,7 +160,7 @@ void PrintJobWorker::SetSettings(
 }
 
 void PrintJobWorker::UpdatePrintSettings(
-    scoped_ptr<base::DictionaryValue> new_settings) {
+    std::unique_ptr<base::DictionaryValue> new_settings) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   PrintingContext::Result result =
       printing_context_->UpdatePrintSettings(*new_settings);
@@ -338,11 +338,9 @@ void PrintJobWorker::OnDocumentDone() {
   }
 
   owner_->PostTask(FROM_HERE,
-                   base::Bind(&NotificationCallback,
-                              make_scoped_refptr(owner_),
+                   base::Bind(&NotificationCallback, base::RetainedRef(owner_),
                               JobEventDetails::DOC_DONE,
-                              document_,
-                              scoped_refptr<PrintedPage>()));
+                              base::RetainedRef(document_), nullptr));
 
   // Makes sure the variables are reinitialized.
   document_ = NULL;
@@ -354,11 +352,9 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
 
   // Signal everyone that the page is about to be printed.
   owner_->PostTask(FROM_HERE,
-                   base::Bind(&NotificationCallback,
-                              make_scoped_refptr(owner_),
-                              JobEventDetails::NEW_PAGE,
-                              document_,
-                              make_scoped_refptr(page)));
+                   base::Bind(&NotificationCallback, base::RetainedRef(owner_),
+                              JobEventDetails::NEW_PAGE, base::RetainedRef(document_),
+                              base::RetainedRef(page)));
 
   // Preprocess.
   if (printing_context_->NewPage() != PrintingContext::OK) {
@@ -380,12 +376,11 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
   }
 
   // Signal everyone that the page is printed.
-  owner_->PostTask(FROM_HERE,
-                   base::Bind(&NotificationCallback,
-                              make_scoped_refptr(owner_),
-                              JobEventDetails::PAGE_DONE,
-                              document_,
-                              make_scoped_refptr(page)));
+  owner_->PostTask(
+      FROM_HERE,
+      base::Bind(&NotificationCallback, base::RetainedRef(owner_),
+                 JobEventDetails::PAGE_DONE, base::RetainedRef(document_),
+                 base::RetainedRef(page)));
 }
 
 void PrintJobWorker::OnFailure() {
@@ -394,12 +389,11 @@ void PrintJobWorker::OnFailure() {
   // We may loose our last reference by broadcasting the FAILED event.
   scoped_refptr<PrintJobWorkerOwner> handle(owner_);
 
-  owner_->PostTask(FROM_HERE,
-                   base::Bind(&NotificationCallback,
-                              make_scoped_refptr(owner_),
-                              JobEventDetails::FAILED,
-                              document_,
-                              scoped_refptr<PrintedPage>()));
+  owner_->PostTask(
+      FROM_HERE,
+      base::Bind(&NotificationCallback, base::RetainedRef(owner_),
+                 JobEventDetails::FAILED,
+                 base::RetainedRef(document_), nullptr));
   Cancel();
 
   // Makes sure the variables are reinitialized.
diff --git a/chromium_src/chrome/browser/printing/print_job_worker.h b/chromium_src/chrome/browser/printing/print_job_worker.h
index a8378bb2353d..6b15097b7af4 100644
--- a/chromium_src/chrome/browser/printing/print_job_worker.h
+++ b/chromium_src/chrome/browser/printing/print_job_worker.h
@@ -48,7 +48,7 @@ class PrintJobWorker {
       MarginType margin_type);
 
   // Set the new print settings.
-  void SetSettings(scoped_ptr<base::DictionaryValue> new_settings);
+  void SetSettings(std::unique_ptr<base::DictionaryValue> new_settings);
 
   // Starts the printing loop. Every pages are printed as soon as the data is
   // available. Makes sure the new_document is the right one.
@@ -116,7 +116,7 @@ class PrintJobWorker {
   void GetSettingsWithUIDone(PrintingContext::Result result);
 
   // Called on the UI thread to update the print settings.
-  void UpdatePrintSettings(scoped_ptr<base::DictionaryValue> new_settings);
+  void UpdatePrintSettings(std::unique_ptr<base::DictionaryValue> new_settings);
 
   // Reports settings back to owner_.
   void GetSettingsDone(PrintingContext::Result result);
@@ -127,10 +127,10 @@ class PrintJobWorker {
   void UseDefaultSettings();
 
   // Printing context delegate.
-  scoped_ptr<PrintingContext::Delegate> printing_context_delegate_;
+  std::unique_ptr<PrintingContext::Delegate> printing_context_delegate_;
 
   // Information about the printer setting.
-  scoped_ptr<PrintingContext> printing_context_;
+  std::unique_ptr<PrintingContext> printing_context_;
 
   // The printed document. Only has read-only access.
   scoped_refptr<PrintedDocument> document_;
diff --git a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc
index a195ad4c6adf..d1f3660f8d2d 100644
--- a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc
@@ -43,7 +43,7 @@ void StopWorker(int document_cookie) {
 char* CopyPDFDataOnIOThread(
     const PrintHostMsg_DidPreviewDocument_Params& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  scoped_ptr<base::SharedMemory> shared_buf(
+  std::unique_ptr<base::SharedMemory> shared_buf(
       new base::SharedMemory(params.metafile_data_handle, true));
   if (!shared_buf->Map(params.data_size))
     return nullptr;
diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc
index dbb57906e777..2bbafdd8e55a 100644
--- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc
+++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc
@@ -132,7 +132,7 @@ void PrintViewManagerBase::OnDidPrintPage(
     }
   }
 
-  scoped_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia);
+  std::unique_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia);
   if (metafile_must_be_valid) {
     if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
       NOTREACHED() << "Invalid metafile header";
diff --git a/chromium_src/chrome/browser/printing/printer_query.cc b/chromium_src/chrome/browser/printing/printer_query.cc
index 6cd11ff067ef..72e2b85f635c 100644
--- a/chromium_src/chrome/browser/printing/printer_query.cc
+++ b/chromium_src/chrome/browser/printing/printer_query.cc
@@ -85,7 +85,7 @@ void PrinterQuery::GetSettings(
                                margin_type));
 }
 
-void PrinterQuery::SetSettings(scoped_ptr<base::DictionaryValue> new_settings,
+void PrinterQuery::SetSettings(std::unique_ptr<base::DictionaryValue> new_settings,
                                const base::Closure& callback) {
   StartWorker(callback);
 
diff --git a/chromium_src/chrome/browser/printing/printer_query.h b/chromium_src/chrome/browser/printing/printer_query.h
index 9fd9a82b33ea..934c18592646 100644
--- a/chromium_src/chrome/browser/printing/printer_query.h
+++ b/chromium_src/chrome/browser/printing/printer_query.h
@@ -50,7 +50,7 @@ class PrinterQuery : public PrintJobWorkerOwner {
       const base::Closure& callback);
 
   // Updates the current settings with |new_settings| dictionary values.
-  void SetSettings(scoped_ptr<base::DictionaryValue> new_settings,
+  void SetSettings(std::unique_ptr<base::DictionaryValue> new_settings,
                    const base::Closure& callback);
 
   // Stops the worker thread since the client is done with this object.
@@ -73,7 +73,7 @@ class PrinterQuery : public PrintJobWorkerOwner {
   // All the UI is done in a worker thread because many Win32 print functions
   // are blocking and enters a message loop without your consent. There is one
   // worker thread per print job.
-  scoped_ptr<PrintJobWorker> worker_;
+  std::unique_ptr<PrintJobWorker> worker_;
 
   // Cache of the print context settings for access in the UI thread.
   PrintSettings settings_;
diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.cc b/chromium_src/chrome/browser/printing/printing_message_filter.cc
index d09e05a3427b..819c6af5b020 100644
--- a/chromium_src/chrome/browser/printing/printing_message_filter.cc
+++ b/chromium_src/chrome/browser/printing/printing_message_filter.cc
@@ -373,7 +373,7 @@ void PrintingMessageFilter::UpdateFileDescriptor(int render_view_id, int fd) {
 void PrintingMessageFilter::OnUpdatePrintSettings(
     int document_cookie, const base::DictionaryValue& job_settings,
     IPC::Message* reply_msg) {
-  scoped_ptr<base::DictionaryValue> new_settings(job_settings.DeepCopy());
+  std::unique_ptr<base::DictionaryValue> new_settings(job_settings.DeepCopy());
 
   scoped_refptr<PrinterQuery> printer_query;
   printer_query = queue_->PopPrinterQuery(document_cookie);
diff --git a/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc b/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
index 98932a494bf8..5364aa0b881f 100644
--- a/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
+++ b/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
@@ -29,7 +29,7 @@ ChromeBrowserPepperHostFactory::ChromeBrowserPepperHostFactory(
 
 ChromeBrowserPepperHostFactory::~ChromeBrowserPepperHostFactory() {}
 
-scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
+std::unique_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
     ppapi::host::PpapiHost* host,
     PP_Resource resource,
     PP_Instance instance,
@@ -38,7 +38,7 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
 
   // Make sure the plugin is giving us a valid instance for this resource.
   if (!host_->IsValidInstance(instance))
-    return scoped_ptr<ResourceHost>();
+    return std::unique_ptr<ResourceHost>();
 
   // Private interfaces.
   if (host_->GetPpapiHost()->permissions().HasPermission(
@@ -47,7 +47,7 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
       case PpapiHostMsg_Broker_Create::ID: {
         scoped_refptr<ResourceMessageFilter> broker_filter(
             new PepperBrokerMessageFilter(instance, host_));
-        return scoped_ptr<ResourceHost>(new MessageFilterHost(
+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, resource, broker_filter));
       }
     }
@@ -58,16 +58,16 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
           ppapi::PERMISSION_FLASH)) {
     switch (message.type()) {
       case PpapiHostMsg_Flash_Create::ID:
-        return scoped_ptr<ResourceHost>(
+        return std::unique_ptr<ResourceHost>(
             new PepperFlashBrowserHost(host_, instance, resource));
       case PpapiHostMsg_FlashClipboard_Create::ID: {
         scoped_refptr<ResourceMessageFilter> clipboard_filter(
             new PepperFlashClipboardMessageFilter);
-        return scoped_ptr<ResourceHost>(new MessageFilterHost(
+        return std::unique_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, resource, clipboard_filter));
       }
       case PpapiHostMsg_FlashDRM_Create::ID:
-        return scoped_ptr<ResourceHost>(
+        return std::unique_ptr<ResourceHost>(
             new chrome::PepperFlashDRMHost(host_, instance, resource));
     }
   }
@@ -82,12 +82,12 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(
     PepperIsolatedFileSystemMessageFilter* isolated_fs_filter =
         PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
     if (!isolated_fs_filter)
-      return scoped_ptr<ResourceHost>();
-    return scoped_ptr<ResourceHost>(
+      return std::unique_ptr<ResourceHost>();
+    return std::unique_ptr<ResourceHost>(
         new MessageFilterHost(host, instance, resource, isolated_fs_filter));
   }
 
-  return scoped_ptr<ResourceHost>();
+  return std::unique_ptr<ResourceHost>();
 }
 
 }  // namespace chrome
diff --git a/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h b/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
index b817953b54dc..84385140ceca 100644
--- a/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
+++ b/chromium_src/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
 #define CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
 
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/host/host_factory.h"
 
 namespace content {
@@ -20,7 +20,7 @@ class ChromeBrowserPepperHostFactory : public ppapi::host::HostFactory {
   explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
   ~ChromeBrowserPepperHostFactory() override;
 
-  scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
       ppapi::host::PpapiHost* host,
       PP_Resource resource,
       PP_Instance instance,
diff --git a/chromium_src/chrome/browser/speech/tts_controller.h b/chromium_src/chrome/browser/speech/tts_controller.h
index 3c40b9e5471d..f4dcd7747047 100644
--- a/chromium_src/chrome/browser/speech/tts_controller.h
+++ b/chromium_src/chrome/browser/speech/tts_controller.h
@@ -240,7 +240,7 @@ class Utterance {
 
   // The full options arg passed to tts.speak, which may include fields
   // other than the ones we explicitly parse, below.
-  scoped_ptr<base::Value> options_;
+  std::unique_ptr<base::Value> options_;
 
   // The extension ID of the extension that called speak() and should
   // receive events.
diff --git a/chromium_src/chrome/browser/speech/tts_linux.cc b/chromium_src/chrome/browser/speech/tts_linux.cc
index ba15516ce036..b1e8bc404336 100644
--- a/chromium_src/chrome/browser/speech/tts_linux.cc
+++ b/chromium_src/chrome/browser/speech/tts_linux.cc
@@ -81,7 +81,7 @@ class TtsPlatformImplLinux : public TtsPlatformImpl {
 
   // Map a string composed of a voicename and module to the voicename. Used to
   // uniquely identify a voice across all available modules.
-  scoped_ptr<std::map<std::string, SPDChromeVoice> > all_native_voices_;
+  std::unique_ptr<std::map<std::string, SPDChromeVoice> > all_native_voices_;
 
   friend struct base::DefaultSingletonTraits<TtsPlatformImplLinux>;
 
diff --git a/chromium_src/chrome/browser/speech/tts_message_filter.cc b/chromium_src/chrome/browser/speech/tts_message_filter.cc
index 66e4c40bd5eb..1a198d9e26e1 100644
--- a/chromium_src/chrome/browser/speech/tts_message_filter.cc
+++ b/chromium_src/chrome/browser/speech/tts_message_filter.cc
@@ -83,7 +83,7 @@ void TtsMessageFilter::OnInitializeVoiceList() {
 void TtsMessageFilter::OnSpeak(const TtsUtteranceRequest& request) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  scoped_ptr<Utterance> utterance(new Utterance(browser_context_));
+  std::unique_ptr<Utterance> utterance(new Utterance(browser_context_));
   utterance->set_src_id(request.id);
   utterance->set_text(request.text);
   utterance->set_lang(request.lang);
diff --git a/chromium_src/chrome/common/chrome_paths_linux.cc b/chromium_src/chrome/common/chrome_paths_linux.cc
index 91348fec4808..e89ae822d904 100644
--- a/chromium_src/chrome/common/chrome_paths_linux.cc
+++ b/chromium_src/chrome/common/chrome_paths_linux.cc
@@ -60,7 +60,7 @@ bool GetUserMediaDirectory(const std::string& xdg_name,
 // ~/.config/google-chrome/ for official builds.
 // (This also helps us sidestep issues with other apps grabbing ~/.chromium .)
 bool GetDefaultUserDataDirectory(base::FilePath* result) {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
   base::FilePath config_dir(GetXDGDirectory(env.get(),
                                             kXdgConfigHomeEnvVar,
                                             kDotConfigDir));
@@ -85,7 +85,7 @@ void GetUserCacheDirectory(const base::FilePath& profile_dir,
   // Default value in cases where any of the following fails.
   *result = profile_dir;
 
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::unique_ptr<base::Environment> env(base::Environment::Create());
 
   base::FilePath cache_dir;
   if (!PathService::Get(base::DIR_CACHE, &cache_dir))
diff --git a/chromium_src/chrome/common/chrome_paths_mac.mm b/chromium_src/chrome/common/chrome_paths_mac.mm
index 4a4eb87dc254..bbfd6c9b23b0 100644
--- a/chromium_src/chrome/common/chrome_paths_mac.mm
+++ b/chromium_src/chrome/common/chrome_paths_mac.mm
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/free_deleter.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_constants.h"
 
@@ -235,7 +235,7 @@ NSBundle* OuterAppBundle() {
 
 bool GetUserDataDirectoryForBrowserBundle(NSBundle* bundle,
                                           base::FilePath* result) {
-  scoped_ptr<char, base::FreeDeleter>
+  std::unique_ptr<char, base::FreeDeleter>
       product_dir_name(ProductDirNameForBundle(bundle));
   return GetDefaultUserDataDirectoryForProduct(product_dir_name.get(), result);
 }
diff --git a/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
index dd83b8191c06..bcf6debc4cf5 100644
--- a/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
+++ b/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
@@ -24,7 +24,7 @@ ChromeRendererPepperHostFactory::ChromeRendererPepperHostFactory(
 
 ChromeRendererPepperHostFactory::~ChromeRendererPepperHostFactory() {}
 
-scoped_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHost(
+std::unique_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHost(
     ppapi::host::PpapiHost* host,
     PP_Resource resource,
     PP_Instance instance,
@@ -33,24 +33,24 @@ scoped_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHost(
 
   // Make sure the plugin is giving us a valid instance for this resource.
   if (!host_->IsValidInstance(instance))
-    return scoped_ptr<ResourceHost>();
+    return std::unique_ptr<ResourceHost>();
 
   if (host_->GetPpapiHost()->permissions().HasPermission(
           ppapi::PERMISSION_FLASH)) {
     switch (message.type()) {
       case PpapiHostMsg_Flash_Create::ID: {
-        return scoped_ptr<ResourceHost>(
+        return std::unique_ptr<ResourceHost>(
             new PepperFlashRendererHost(host_, instance, resource));
       }
       case PpapiHostMsg_FlashFullscreen_Create::ID: {
-        return scoped_ptr<ResourceHost>(
+        return std::unique_ptr<ResourceHost>(
             new PepperFlashFullscreenHost(host_, instance, resource));
       }
       case PpapiHostMsg_FlashMenu_Create::ID: {
         ppapi::proxy::SerializedFlashMenu serialized_menu;
         if (ppapi::UnpackMessage<PpapiHostMsg_FlashMenu_Create>(
                 message, &serialized_menu)) {
-          return scoped_ptr<ResourceHost>(new PepperFlashMenuHost(
+          return std::unique_ptr<ResourceHost>(new PepperFlashMenuHost(
               host_, instance, resource, serialized_menu));
         }
         break;
@@ -71,7 +71,7 @@ scoped_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHost(
         PP_PrivateFontCharset charset;
         if (ppapi::UnpackMessage<PpapiHostMsg_FlashFontFile_Create>(
                 message, &description, &charset)) {
-          return scoped_ptr<ResourceHost>(new PepperFlashFontFileHost(
+          return std::unique_ptr<ResourceHost>(new PepperFlashFontFileHost(
               host_, instance, resource, description, charset));
         }
         break;
@@ -79,5 +79,5 @@ scoped_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHost(
     }
   }
 
-  return scoped_ptr<ResourceHost>();
+  return std::unique_ptr<ResourceHost>();
 }
diff --git a/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h b/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
index dd12e9d91608..c52c73b56f04 100644
--- a/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
+++ b/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
 #define CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
 
+#include "base/macros.h"
 #include "ppapi/host/host_factory.h"
 
 namespace content {
@@ -17,7 +18,7 @@ class ChromeRendererPepperHostFactory : public ppapi::host::HostFactory {
   ~ChromeRendererPepperHostFactory() override;
 
   // HostFactory.
-  scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
+  std::unique_ptr<ppapi::host::ResourceHost> CreateResourceHost(
       ppapi::host::PpapiHost* host,
       PP_Resource resource,
       PP_Instance instance,
diff --git a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 66edd3f938ad..59046b328bfe 100644
--- a/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -205,7 +205,7 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
     style |= SkTypeface::kBold;
   if (params.font_desc.italic)
     style |= SkTypeface::kItalic;
-  skia::RefPtr<SkTypeface> typeface = skia::AdoptRef(SkTypeface::CreateFromName(
+  sk_sp<SkTypeface> typeface(SkTypeface::CreateFromName(
       params.font_desc.face.c_str(), static_cast<SkTypeface::Style>(style)));
   if (!typeface)
     return PP_ERROR_FAILED;
@@ -255,7 +255,7 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
   paint.setAntiAlias(true);
   paint.setHinting(SkPaint::kFull_Hinting);
   paint.setTextSize(SkIntToScalar(params.font_desc.size));
-  paint.setTypeface(typeface.get());  // Takes a ref and manages lifetime.
+  paint.setTypeface(std::move(typeface));
   if (params.allow_subpixel_aa) {
     paint.setSubpixelText(true);
     paint.setLCDRenderText(true);
diff --git a/chromium_src/chrome/renderer/pepper/pepper_helper.cc b/chromium_src/chrome/renderer/pepper/pepper_helper.cc
index a610a30dfff5..c9700c997137 100644
--- a/chromium_src/chrome/renderer/pepper/pepper_helper.cc
+++ b/chromium_src/chrome/renderer/pepper/pepper_helper.cc
@@ -18,9 +18,9 @@ void PepperHelper::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
   // TODO(brettw) figure out how to hook up the host factory. It needs some
   // kind of filter-like system to allow dynamic additions.
   host->GetPpapiHost()->AddHostFactoryFilter(
-      scoped_ptr<ppapi::host::HostFactory>(
+      std::unique_ptr<ppapi::host::HostFactory>(
           new ChromeRendererPepperHostFactory(host)));
   host->GetPpapiHost()->AddInstanceMessageFilter(
-      scoped_ptr<ppapi::host::InstanceMessageFilter>(
+      std::unique_ptr<ppapi::host::InstanceMessageFilter>(
           new PepperSharedMemoryMessageFilter(host)));
 }
diff --git a/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc b/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
index 6fbadd121163..7c219f60b814 100644
--- a/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
+++ b/chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
@@ -43,7 +43,7 @@ void PepperSharedMemoryMessageFilter::OnHostMsgCreateSharedMemory(
     ppapi::proxy::SerializedHandle* plugin_handle) {
   plugin_handle->set_null_shmem();
   *host_handle_id = -1;
-  scoped_ptr<base::SharedMemory> shm(
+  std::unique_ptr<base::SharedMemory> shm(
       content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(size));
   if (!shm.get())
     return;
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
index 39d938960cbb..7ff3471f953a 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
@@ -1169,7 +1169,7 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
   if (buf_size == 0)
     return false;
 
-  scoped_ptr<base::SharedMemory> shared_buf(
+  std::unique_ptr<base::SharedMemory> shared_buf(
       content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(buf_size));
   if (!shared_buf)
     return false;
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.h b/chromium_src/chrome/renderer/printing/print_web_view_helper.h
index 8407777b4a0c..e3e644880974 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.h
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.h
@@ -244,10 +244,10 @@ class PrintWebViewHelper
   void SetPrintPagesParams(const PrintMsg_PrintPages_Params& settings);
 
   // WebView used only to print the selection.
-  scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
+  std::unique_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
   bool reset_prep_frame_view_;
 
-  scoped_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
+  std::unique_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
   bool is_print_ready_metafile_sent_;
   bool ignore_css_margins_;
 
@@ -343,8 +343,8 @@ class PrintWebViewHelper
     FrameReference source_frame_;
     blink::WebNode source_node_;
 
-    scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
-    scoped_ptr<PdfMetafileSkia> metafile_;
+    std::unique_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
+    std::unique_ptr<PdfMetafileSkia> metafile_;
 
     // Total page count in the renderer.
     int total_page_count_;
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
index b39133931a91..608f406e623f 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
@@ -29,7 +29,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
   PrintMsg_PrintPage_Params page_params;
   page_params.params = print_params;
   page_params.page_number = page_number;
-  scoped_ptr<PdfMetafileSkia> draft_metafile;
+  std::unique_ptr<PdfMetafileSkia> draft_metafile;
   PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
   if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
     draft_metafile.reset(new PdfMetafileSkia);
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm b/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
index 903fbd68733a..36ba4a597cdd 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
@@ -54,7 +54,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
     int page_number,
     const PrintMsg_Print_Params& print_params) {
   PrintMsg_Print_Params printParams = print_params;
-  scoped_ptr<PdfMetafileSkia> draft_metafile;
+  std::unique_ptr<PdfMetafileSkia> draft_metafile;
   PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
 
   bool render_to_draft = print_preview_context_.IsModifiable() &&
diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
index ea53da443f5e..7ff17a388bcc 100644
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
@@ -27,7 +27,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
   PrintMsg_PrintPage_Params page_params;
   page_params.params = print_params;
   page_params.page_number = page_number;
-  scoped_ptr<PdfMetafileSkia> draft_metafile;
+  std::unique_ptr<PdfMetafileSkia> draft_metafile;
   PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
   if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
     draft_metafile.reset(new PdfMetafileSkia);
diff --git a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
index a3b51a8c46e2..46465f4dfd4a 100644
--- a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
+++ b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
@@ -322,7 +322,7 @@ bool SpellcheckWordIterator::Initialize(
   if (rule.empty())
     return false;
 
-  scoped_ptr<base::i18n::BreakIterator> iterator(
+  std::unique_ptr<base::i18n::BreakIterator> iterator(
       new base::i18n::BreakIterator(base::string16(), rule));
   if (!iterator->Init()) {
     // Since we're not passing in any text, the only reason this could fail
diff --git a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
index 03fd8e666f5f..4490c7a90e8e 100644
--- a/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
+++ b/chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
@@ -167,7 +167,7 @@ class SpellcheckWordIterator {
   const SpellcheckCharAttribute* attribute_;
 
   // The break iterator.
-  scoped_ptr<base::i18n::BreakIterator> iterator_;
+  std::unique_ptr<base::i18n::BreakIterator> iterator_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellcheckWordIterator);
 };
diff --git a/chromium_src/net/test/embedded_test_server/stream_listen_socket.h b/chromium_src/net/test/embedded_test_server/stream_listen_socket.h
index 9df512583063..7ad25437ec39 100644
--- a/chromium_src/net/test/embedded_test_server/stream_listen_socket.h
+++ b/chromium_src/net/test/embedded_test_server/stream_listen_socket.h
@@ -58,7 +58,7 @@ class StreamListenSocket :
     // |server| is the original listening Socket, connection is the new
     // Socket that was created.
     virtual void DidAccept(StreamListenSocket* server,
-                           scoped_ptr<StreamListenSocket> connection) = 0;
+                           std::unique_ptr<StreamListenSocket> connection) = 0;
     virtual void DidRead(StreamListenSocket* connection,
                          const char* data,
                          int len) = 0;
@@ -140,7 +140,7 @@ class StreamListenSocketFactory {
   virtual ~StreamListenSocketFactory() {}
 
   // Returns a new instance of StreamListenSocket or NULL if an error occurred.
-  virtual scoped_ptr<StreamListenSocket> CreateAndListen(
+  virtual std::unique_ptr<StreamListenSocket> CreateAndListen(
       StreamListenSocket::Delegate* delegate) const = 0;
 };
 
diff --git a/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc b/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
index 8e1f1177adaf..50aac809052e 100644
--- a/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
+++ b/chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
@@ -33,14 +33,14 @@ namespace net {
 namespace test_server {
 
 // static
-scoped_ptr<TCPListenSocket> TCPListenSocket::CreateAndListen(
+std::unique_ptr<TCPListenSocket> TCPListenSocket::CreateAndListen(
     const string& ip,
     uint16_t port,
     StreamListenSocket::Delegate* del) {
   SocketDescriptor s = CreateAndBind(ip, port);
   if (s == kInvalidSocket)
-    return scoped_ptr<TCPListenSocket>();
-  scoped_ptr<TCPListenSocket> sock(new TCPListenSocket(s, del));
+    return std::unique_ptr<TCPListenSocket>();
+  std::unique_ptr<TCPListenSocket> sock(new TCPListenSocket(s, del));
   sock->Listen();
   return sock;
 }
@@ -108,7 +108,7 @@ void TCPListenSocket::Accept() {
   SocketDescriptor conn = AcceptSocket();
   if (conn == kInvalidSocket)
     return;
-  scoped_ptr<TCPListenSocket> sock(new TCPListenSocket(conn, socket_delegate_));
+  std::unique_ptr<TCPListenSocket> sock(new TCPListenSocket(conn, socket_delegate_));
 #if defined(OS_POSIX)
   sock->WatchSocket(WAITING_READ);
 #endif
diff --git a/chromium_src/net/test/embedded_test_server/tcp_listen_socket.h b/chromium_src/net/test/embedded_test_server/tcp_listen_socket.h
index 6990845f3928..db18fd0f0eb4 100644
--- a/chromium_src/net/test/embedded_test_server/tcp_listen_socket.h
+++ b/chromium_src/net/test/embedded_test_server/tcp_listen_socket.h
@@ -23,7 +23,7 @@ class TCPListenSocket : public StreamListenSocket {
 
   // Listen on port for the specified IP address.  Use 127.0.0.1 to only
   // accept local connections.
-  static scoped_ptr<TCPListenSocket> CreateAndListen(
+  static std::unique_ptr<TCPListenSocket> CreateAndListen(
       const std::string& ip,
       uint16_t port,
       StreamListenSocket::Delegate* del);
diff --git a/vendor/brightray b/vendor/brightray
index 3f18ef50c26a..2f3fbc1594aa 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 3f18ef50c26a6cea42845292abe076fb627f5ef1
+Subproject commit 2f3fbc1594aae7a44498897c0d790f42b2a31e0a

From 899cdb48d7975ab38547ada1a37cd0a5dc115d8f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 12:46:14 +0900
Subject: [PATCH 331/510] Fix using invalid pointer as SiteInstance

---
 atom/browser/atom_browser_client.cc | 5 +++--
 vendor/brightray                    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index c2ee2096ee9e..220256646831 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -129,8 +129,9 @@ void AtomBrowserClient::OverrideSiteInstanceForNavigation(
   if (url.SchemeIs(url::kJavaScriptScheme))
     return;
 
-  *new_instance =
-      content::SiteInstance::CreateForURL(browser_context, url).get();
+  scoped_refptr<content::SiteInstance> site_instance =
+      content::SiteInstance::CreateForURL(browser_context, url);
+  *new_instance = site_instance.get();
 
   // Remember the original renderer process of the pending renderer process.
   auto current_process = current_instance->GetProcess();
diff --git a/vendor/brightray b/vendor/brightray
index 2f3fbc1594aa..531df4370bee 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 2f3fbc1594aae7a44498897c0d790f42b2a31e0a
+Subproject commit 531df4370bee785169d1d6a03f1746895e446912

From 530f19e9561a4c684271ba5ba612a68cacc51ba7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 12:57:46 +0900
Subject: [PATCH 332/510] Fix crash due to site_instace being freed early

---
 atom/browser/atom_browser_client.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 220256646831..5a6b49483bcb 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -52,6 +52,9 @@ bool g_suppress_renderer_process_restart = false;
 // Custom schemes to be registered to handle service worker.
 std::string g_custom_service_worker_schemes = "";
 
+void Noop(scoped_refptr<content::SiteInstance>) {
+}
+
 }  // namespace
 
 // static
@@ -133,6 +136,13 @@ void AtomBrowserClient::OverrideSiteInstanceForNavigation(
       content::SiteInstance::CreateForURL(browser_context, url);
   *new_instance = site_instance.get();
 
+  // Make sure the |site_instance| is not freed when this function returns.
+  // FIXME(zcbenz): We should adjust OverrideSiteInstanceForNavigation's
+  // interface to solve this.
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&Noop, base::RetainedRef(site_instance)));
+
   // Remember the original renderer process of the pending renderer process.
   auto current_process = current_instance->GetProcess();
   auto pending_process = (*new_instance)->GetProcess();

From 4b675a741d047c2da6086992caed05d59440f296 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 13:01:47 +0900
Subject: [PATCH 333/510] Init feature list in node process

It is a new dependency of gin.
---
 atom/app/node_main.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index b946ae28ff94..6f71d39f5740 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -7,8 +7,9 @@
 #include "atom/app/uv_task_runner.h"
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"
-#include "base/command_line.h"
 #include "atom/common/node_includes.h"
+#include "base/command_line.h"
+#include "base/feature_list.h"
 #include "base/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
@@ -27,6 +28,11 @@ int NodeMain(int argc, char *argv[]) {
     scoped_refptr<UvTaskRunner> uv_task_runner(new UvTaskRunner(loop));
     base::ThreadTaskRunnerHandle handle(uv_task_runner);
 
+    // Initialize feature list.
+    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
+    feature_list->InitializeFromCommandLine("", "");
+    base::FeatureList::SetInstance(std::move(feature_list));
+
     gin::V8Initializer::LoadV8Snapshot();
     gin::V8Initializer::LoadV8Natives();
     JavascriptEnvironment gin_env;

From 06800940eca919b440e76c11b3db2db1ac43627b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 13:03:43 +0900
Subject: [PATCH 334/510] Fix cpplint warnings

---
 atom/app/atom_main_delegate.cc                           | 3 ++-
 atom/browser/net/atom_url_request_job_factory.cc         | 6 ++++--
 atom/browser/net/atom_url_request_job_factory.h          | 7 ++++---
 atom/common/native_mate_converters/v8_value_converter.cc | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
index 82337dc5f6a6..ff7ba0894f35 100644
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -134,7 +134,8 @@ content::ContentUtilityClient* AtomMainDelegate::CreateContentUtilityClient() {
   return utility_client_.get();
 }
 
-std::unique_ptr<brightray::ContentClient> AtomMainDelegate::CreateContentClient() {
+std::unique_ptr<brightray::ContentClient>
+AtomMainDelegate::CreateContentClient() {
   return std::unique_ptr<brightray::ContentClient>(new AtomContentClient);
 }
 
diff --git a/atom/browser/net/atom_url_request_job_factory.cc b/atom/browser/net/atom_url_request_job_factory.cc
index 3bf332d0fb33..aff2565814b5 100644
--- a/atom/browser/net/atom_url_request_job_factory.cc
+++ b/atom/browser/net/atom_url_request_job_factory.cc
@@ -23,7 +23,8 @@ AtomURLRequestJobFactory::~AtomURLRequestJobFactory() {
 }
 
 bool AtomURLRequestJobFactory::SetProtocolHandler(
-    const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler) {
+    const std::string& scheme,
+    std::unique_ptr<ProtocolHandler> protocol_handler) {
   if (!protocol_handler) {
     ProtocolHandlerMap::iterator it = protocol_handler_map_.find(scheme);
     if (it == protocol_handler_map_.end())
@@ -41,7 +42,8 @@ bool AtomURLRequestJobFactory::SetProtocolHandler(
 }
 
 std::unique_ptr<ProtocolHandler> AtomURLRequestJobFactory::ReplaceProtocol(
-    const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler) {
+    const std::string& scheme,
+    std::unique_ptr<ProtocolHandler> protocol_handler) {
   if (!ContainsKey(protocol_handler_map_, scheme))
     return nullptr;
   ProtocolHandler* original_protocol_handler = protocol_handler_map_[scheme];
diff --git a/atom/browser/net/atom_url_request_job_factory.h b/atom/browser/net/atom_url_request_job_factory.h
index ba7a4796f9a5..e3dbd7754240 100644
--- a/atom/browser/net/atom_url_request_job_factory.h
+++ b/atom/browser/net/atom_url_request_job_factory.h
@@ -24,13 +24,14 @@ class AtomURLRequestJobFactory : public net::URLRequestJobFactory {
   // Sets the ProtocolHandler for a scheme. Returns true on success, false on
   // failure (a ProtocolHandler already exists for |scheme|). On success,
   // URLRequestJobFactory takes ownership of |protocol_handler|.
-  bool SetProtocolHandler(
-      const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler);
+  bool SetProtocolHandler(const std::string& scheme,
+                          std::unique_ptr<ProtocolHandler> protocol_handler);
 
   // Intercepts the ProtocolHandler for a scheme. Returns the original protocol
   // handler on success, otherwise returns NULL.
   std::unique_ptr<ProtocolHandler> ReplaceProtocol(
-      const std::string& scheme, std::unique_ptr<ProtocolHandler> protocol_handler);
+      const std::string& scheme,
+      std::unique_ptr<ProtocolHandler> protocol_handler);
 
   // Returns the protocol handler registered with scheme.
   ProtocolHandler* GetProtocolHandler(const std::string& scheme) const;
diff --git a/atom/common/native_mate_converters/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc
index 13df524c34e5..ff96b727e02a 100644
--- a/atom/common/native_mate_converters/v8_value_converter.cc
+++ b/atom/common/native_mate_converters/v8_value_converter.cc
@@ -371,7 +371,8 @@ base::Value* V8ValueConverter::FromV8Object(
       child_v8 = v8::Null(isolate);
     }
 
-    std::unique_ptr<base::Value> child(FromV8ValueImpl(state, child_v8, isolate));
+    std::unique_ptr<base::Value> child(
+        FromV8ValueImpl(state, child_v8, isolate));
     if (!child.get())
       // JSON.stringify skips properties whose values don't serialize, for
       // example undefined and functions. Emulate that behavior.

From fa0ce7ad5ff63e016a75047d7c0271a3baec5398 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 13:28:16 +0900
Subject: [PATCH 335/510] Adjust to the new behaviors of beforeunload handler

---
 atom/browser/atom_javascript_dialog_manager.cc      |  2 +-
 docs/api/browser-window.md                          | 10 +++++-----
 spec/api-browser-window-spec.js                     | 11 ++---------
 spec/fixtures/api/close-beforeunload-string.html    | 13 -------------
 ...-true.html => close-beforeunload-undefined.html} |  1 -
 5 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 spec/fixtures/api/close-beforeunload-string.html
 rename spec/fixtures/api/{close-beforeunload-true.html => close-beforeunload-undefined.html} (93%)

diff --git a/atom/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc
index 07f3ea69bb7e..eaf311ba1cdb 100644
--- a/atom/browser/atom_javascript_dialog_manager.cc
+++ b/atom/browser/atom_javascript_dialog_manager.cc
@@ -26,7 +26,7 @@ void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
     bool is_reload,
     const DialogClosedCallback& callback) {
   // FIXME(zcbenz): the |message_text| is removed, figure out what should we do.
-  callback.Run(true, base::ASCIIToUTF16("FIXME"));
+  callback.Run(false, base::ASCIIToUTF16("This should not be displayed"));
 }
 
 }  // namespace atom
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 0bd38dec560e..c2bf46d46366 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -217,17 +217,17 @@ will cancel the close.
 
 Usually you would want to use the `beforeunload` handler to decide whether the
 window should be closed, which will also be called when the window is
-reloaded. In Electron, returning an empty string or `false` would cancel the
+reloaded. In Electron, returning any value other than `undefined` would cancel the
 close. For example:
 
 ```javascript
 window.onbeforeunload = (e) => {
   console.log('I do not want to be closed');
 
-  // Unlike usual browsers, in which a string should be returned and the user is
-  // prompted to confirm the page unload, Electron gives developers more options.
-  // Returning empty string or false would prevent the unloading now.
-  // You can also use the dialog API to let the user confirm closing the application.
+  // Unlike usual browsers that a message box will be prompted to users, returning
+  // a non-void value will silently cancel the close.
+  // It is recommended to use the dialog API to let the user confirm closing the
+  // application.
   e.returnValue = false;
 };
 ```
diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index ac85f49068d4..3b1ccabaae59 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -476,18 +476,11 @@ describe('browser-window module', function () {
   })
 
   describe('beforeunload handler', function () {
-    it('returning true would not prevent close', function (done) {
+    it('returning undefined would not prevent close', function (done) {
       w.on('closed', function () {
         done()
       })
-      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-true.html'))
-    })
-
-    it('returning non-empty string would not prevent close', function (done) {
-      w.on('closed', function () {
-        done()
-      })
-      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-string.html'))
+      w.loadURL('file://' + path.join(fixtures, 'api', 'close-beforeunload-undefined.html'))
     })
 
     it('returning false would prevent close', function (done) {
diff --git a/spec/fixtures/api/close-beforeunload-string.html b/spec/fixtures/api/close-beforeunload-string.html
deleted file mode 100644
index c8c6c6beacdd..000000000000
--- a/spec/fixtures/api/close-beforeunload-string.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-<script type="text/javascript" charset="utf-8">
-  window.onbeforeunload = function() {
-    setTimeout(function() {
-      require('electron').remote.getCurrentWindow().emit('onbeforeunload');
-    }, 0);
-    return 'string';
-  }
-  window.close();
-</script>
-</body>
-</html>
diff --git a/spec/fixtures/api/close-beforeunload-true.html b/spec/fixtures/api/close-beforeunload-undefined.html
similarity index 93%
rename from spec/fixtures/api/close-beforeunload-true.html
rename to spec/fixtures/api/close-beforeunload-undefined.html
index 6de0c6cd3989..b4e4178f6a1d 100644
--- a/spec/fixtures/api/close-beforeunload-true.html
+++ b/spec/fixtures/api/close-beforeunload-undefined.html
@@ -5,7 +5,6 @@
     setTimeout(function() {
       require('electron').remote.getCurrentWindow().emit('onbeforeunload');
     }, 0);
-    return true;
   }
   window.close();
 </script>

From a92b4a6da4898257e7743e27f2a132062110b607 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 14:26:38 +0900
Subject: [PATCH 336/510] Make |button| default to left button

This fixes the failing test of sendInputEvent.
---
 atom/common/native_mate_converters/blink_converter.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index 684b06a36329..4e37836c5a55 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -92,6 +92,8 @@ struct Converter<blink::WebMouseEvent::Button> {
       *out = blink::WebMouseEvent::Button::ButtonMiddle;
     else if (button == "right")
       *out = blink::WebMouseEvent::Button::ButtonRight;
+    else
+      return false;
     return true;
   }
 };
@@ -202,7 +204,8 @@ bool Converter<blink::WebMouseEvent>::FromV8(
     return false;
   if (!dict.Get("x", &out->x) || !dict.Get("y", &out->y))
     return false;
-  dict.Get("button", &out->button);
+  if (!dict.Get("button", &out->button))
+    out->button = blink::WebMouseEvent::Button::ButtonLeft;
   dict.Get("globalX", &out->globalX);
   dict.Get("globalY", &out->globalY);
   dict.Get("movementX", &out->movementX);

From f68d0f324f3b5d3ad2f04574ed50a6b7885997ac Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Mon, 23 May 2016 10:59:55 +0530
Subject: [PATCH 337/510] deprecate app.allowNTLMCredentialsForAllDomains

---
 atom/browser/api/atom_api_session.cc | 24 ++++++++++++++++++++++++
 atom/browser/api/atom_api_session.h  |  1 +
 docs/api/app.md                      | 10 ----------
 docs/api/session.md                  | 17 +++++++++++++++++
 lib/browser/api/app.js               | 17 +++++++++++++----
 5 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
index 58fd358ca971..6cc5ffe7f66a 100644
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -36,6 +36,8 @@
 #include "net/base/load_flags.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/dns/host_cache.h"
+#include "net/http/http_auth_handler_factory.h"
+#include "net/http/http_auth_preferences.h"
 #include "net/proxy/proxy_service.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/url_request/url_request_context.h"
@@ -284,6 +286,19 @@ void ClearHostResolverCacheInIO(
   }
 }
 
+void AllowNTLMCredentialsForDomainsInIO(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    const std::string& domains) {
+  auto request_context = context_getter->GetURLRequestContext();
+  auto auth_handler = request_context->http_auth_handler_factory();
+  if (auth_handler) {
+    auto auth_preferences = const_cast<net::HttpAuthPreferences*>(
+        auth_handler->http_auth_preferences());
+    if (auth_preferences)
+      auth_preferences->set_server_whitelist(domains);
+  }
+}
+
 }  // namespace
 
 Session::Session(v8::Isolate* isolate, AtomBrowserContext* browser_context)
@@ -432,6 +447,13 @@ void Session::ClearHostResolverCache(mate::Arguments* args) {
                  callback));
 }
 
+void Session::AllowNTLMCredentialsForDomains(const std::string& domains) {
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+      base::Bind(&AllowNTLMCredentialsForDomainsInIO,
+                 make_scoped_refptr(browser_context_->GetRequestContext()),
+                 domains));
+}
+
 v8::Local<v8::Value> Session::Cookies(v8::Isolate* isolate) {
   if (cookies_.IsEmpty()) {
     auto handle = atom::api::Cookies::Create(isolate, browser_context());
@@ -487,6 +509,8 @@ void Session::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setPermissionRequestHandler",
                  &Session::SetPermissionRequestHandler)
       .SetMethod("clearHostResolverCache", &Session::ClearHostResolverCache)
+      .SetMethod("allowNTLMCredentialsForDomains",
+                 &Session::AllowNTLMCredentialsForDomains)
       .SetProperty("cookies", &Session::Cookies)
       .SetProperty("webRequest", &Session::WebRequest);
 }
diff --git a/atom/browser/api/atom_api_session.h b/atom/browser/api/atom_api_session.h
index 5e08a85aa7d1..0cebf09ea1f3 100644
--- a/atom/browser/api/atom_api_session.h
+++ b/atom/browser/api/atom_api_session.h
@@ -79,6 +79,7 @@ class Session: public mate::TrackableObject<Session>,
   void SetPermissionRequestHandler(v8::Local<v8::Value> val,
                                    mate::Arguments* args);
   void ClearHostResolverCache(mate::Arguments* args);
+  void AllowNTLMCredentialsForDomains(const std::string& domains);
   v8::Local<v8::Value> Cookies(v8::Isolate* isolate);
   v8::Local<v8::Value> WebRequest(v8::Isolate* isolate);
 
diff --git a/docs/api/app.md b/docs/api/app.md
index fdc5cc9b72e4..eddd4147db9d 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -443,16 +443,6 @@ Adds `tasks` to the [Tasks][tasks] category of the JumpList on Windows.
   consists of two or more icons, set this value to identify the icon. If an
   icon file consists of one icon, this value is 0.
 
-### `app.allowNTLMCredentialsForAllDomains()`
-
-Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate
-authentication - normally, Electron will only send NTLM/Kerberos credentials for
-URLs that fall under "Local Intranet" sites (i.e. are in the same domain as you).
-However, this detection often fails when corporate networks are badly configured,
-so this lets you co-opt this behavior and enable it for all URLs.
-
-**Note:** This method should be called before the `ready` event gets emitted.
-
 ### `app.makeSingleInstance(callback)`
 
 * `callback` Function
diff --git a/docs/api/session.md b/docs/api/session.md
index 33a53df5844e..2d950ddd474a 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -323,6 +323,23 @@ session.fromPartition(partition).setPermissionRequestHandler((webContents, permi
 
 Clears the host resolver cache.
 
+#### `ses.allowNTLMCredentialsForDomains(domains)`
+
+* `domains` String - A comma-seperated list of servers for which
+  integrated authentication is enabled.
+
+Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate
+authentication.
+
+```javascript
+// consider any url ending with `example.com`, `foobar.com`, `baz`
+// for integrated authentication.
+session.defaultSession.allowNTLMCredentialsForDomains('*example.com, *foobar.com, *baz')
+
+// consider all urls for integrated authentication.
+session.defaultSession.allowNTLMCredentialsForDomains('*')
+```
+
 #### `ses.webRequest`
 
 The `webRequest` API set allows to intercept and modify contents of a request at
diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 38b465688cfc..f8a531626bf7 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const {Menu} = require('electron')
+const {deprecate, Menu, session} = require('electron')
 const {EventEmitter} = require('events')
 
 const bindings = process.atomBinding('app')
@@ -22,9 +22,6 @@ Object.assign(app, {
   commandLine: {
     appendSwitch: bindings.appendSwitch,
     appendArgument: bindings.appendArgument
-  },
-  allowNTLMCredentialsForAllDomains () {
-    this.commandLine.appendSwitch('auth-server-whitelist', '*')
   }
 })
 
@@ -44,6 +41,18 @@ if (process.platform === 'darwin') {
   }
 }
 
+app.allowNTLMCredentialsForAllDomains = function (allow) {
+  if (!process.noDeprecations) {
+    deprecate.warn('app.allowNTLMCredentialsForAllDomains', 'session.allowNTLMCredentialsForDomains')
+  }
+  let domains = allow ? '*' : ''
+  if (!this.isReady()) {
+    this.commandLine.appendSwitch('auth-server-whitelist', domains)
+  } else {
+    session.defaultSession.allowNTLMCredentialsForDomains(domains)
+  }
+}
+
 // Routes the events to webContents.
 const events = ['login', 'certificate-error', 'select-client-certificate']
 for (let name of events) {

From de1fc9d4326047bbad5bf1a311200cf7b8578166 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 15:10:55 +0900
Subject: [PATCH 338/510] Fix building on Linux

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index 531df4370bee..7e685c19fd76 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 531df4370bee785169d1d6a03f1746895e446912
+Subproject commit 7e685c19fd7600ce360c55ac5ee80d621849214f

From d6f9e57e33c177ffc814a07fad9e8c5fe45c10f9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 16:04:10 +0900
Subject: [PATCH 339/510] Fix chrome.devtools not available in devtools
 extensions

---
 lib/renderer/inspector.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/renderer/inspector.js b/lib/renderer/inspector.js
index ca60c84d4be9..12d3ae907243 100644
--- a/lib/renderer/inspector.js
+++ b/lib/renderer/inspector.js
@@ -1,4 +1,7 @@
 window.onload = function () {
+  // Make sure |window.chrome| is defined for devtools extensions.
+  hijackSetInjectedScript(InspectorFrontendHost)
+
   // Use menu API to show context menu.
   window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
 
@@ -6,6 +9,18 @@ window.onload = function () {
   window.WebInspector.createFileSelectorElement = createFileSelectorElement
 }
 
+const hijackSetInjectedScript = function (InspectorFrontendHost) {
+  const {setInjectedScriptForOrigin} = InspectorFrontendHost
+  InspectorFrontendHost.setInjectedScriptForOrigin = function (origin, source) {
+    const wrapped = `(function (...args) {
+      window.chrome = {}
+      const original = ${source}
+      original(...args)
+    })`
+    setInjectedScriptForOrigin(origin, wrapped)
+  }
+}
+
 var convertToMenuTemplate = function (items) {
   var fn, i, item, len, template
   template = []

From 9d82041923850d7e5688ee4a8122e3f7c7baa26a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 16:15:39 +0900
Subject: [PATCH 340/510] Fix js lint warnings

---
 lib/renderer/inspector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/inspector.js b/lib/renderer/inspector.js
index 12d3ae907243..aea87f7f2b81 100644
--- a/lib/renderer/inspector.js
+++ b/lib/renderer/inspector.js
@@ -1,6 +1,6 @@
 window.onload = function () {
   // Make sure |window.chrome| is defined for devtools extensions.
-  hijackSetInjectedScript(InspectorFrontendHost)
+  hijackSetInjectedScript(window.InspectorFrontendHost)
 
   // Use menu API to show context menu.
   window.InspectorFrontendHost.showContextMenuAtPoint = createMenu

From 44651656dd297b8ae0f8fb688bdfdad8860b0435 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 16:39:19 +0900
Subject: [PATCH 341/510] Fix building on Windows

---
 atom/browser/ui/win/notify_icon_host.h        |  3 +-
 .../browser/printing/pdf_to_emf_converter.cc  | 38 ++++++++++---------
 .../chrome/browser/printing/print_job.cc      |  2 +-
 .../chrome/utility/printing_handler_win.cc    |  4 +-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/atom/browser/ui/win/notify_icon_host.h b/atom/browser/ui/win/notify_icon_host.h
index 6797d4f6a54c..773b3112d470 100644
--- a/atom/browser/ui/win/notify_icon_host.h
+++ b/atom/browser/ui/win/notify_icon_host.h
@@ -9,8 +9,7 @@
 
 #include <vector>
 
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/macros.h"
 
 namespace atom {
 
diff --git a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
index 49a99f4af096..e13effd64de0 100644
--- a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -58,7 +58,7 @@ typedef std::unique_ptr<base::File, BrowserThread::DeleteOnFileThread>
 class LazyEmf : public MetafilePlayer {
  public:
   LazyEmf(const scoped_refptr<RefCountedTempDir>& temp_dir, ScopedTempFile file)
-      : temp_dir_(temp_dir), file_(file.Pass()) {}
+      : temp_dir_(temp_dir), file_(std::move(file)) {}
   virtual ~LazyEmf() { Close(); }
 
   virtual bool SafePlayback(HDC hdc) const override;
@@ -131,8 +131,8 @@ class PdfToEmfUtilityProcessHostClient
     const PdfToEmfConverter::GetPageCallback& callback() const {
       return callback_;
     }
-    ScopedTempFile emf() { return emf_.Pass(); }
-    void set_emf(ScopedTempFile emf) { emf_ = emf.Pass(); }
+    ScopedTempFile TakeEmf() { return std::move(emf_); }
+    void set_emf(ScopedTempFile emf) { emf_ = std::move(emf); }
 
    private:
     int page_number_;
@@ -203,10 +203,10 @@ ScopedTempFile CreateTempFile(scoped_refptr<RefCountedTempDir>* temp_dir) {
     *temp_dir = new RefCountedTempDir();
   ScopedTempFile file;
   if (!(*temp_dir)->IsValid())
-    return file.Pass();
+    return file;
   base::FilePath path;
   if (!base::CreateTemporaryFileInDir((*temp_dir)->GetPath(), &path))
-    return file.Pass();
+    return file;
   file.reset(new base::File(path,
                             base::File::FLAG_CREATE_ALWAYS |
                             base::File::FLAG_WRITE |
@@ -215,7 +215,7 @@ ScopedTempFile CreateTempFile(scoped_refptr<RefCountedTempDir>* temp_dir) {
                             base::File::FLAG_TEMPORARY));
   if (!file->IsValid())
     file.reset();
-  return file.Pass();
+  return file;
 }
 
 ScopedTempFile CreateTempPdfFile(
@@ -230,7 +230,7 @@ ScopedTempFile CreateTempPdfFile(
     pdf_file.reset();
   }
   pdf_file->Seek(base::File::FROM_BEGIN, 0);
-  return pdf_file.Pass();
+  return pdf_file;
 }
 
 bool LazyEmf::SafePlayback(HDC hdc) const {
@@ -319,12 +319,11 @@ void PdfToEmfUtilityProcessHostClient::OnProcessStarted() {
 
 void PdfToEmfUtilityProcessHostClient::OnTempPdfReady(ScopedTempFile pdf) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (!utility_process_host_)
+  if (!utility_process_host_ || !pdf)
     return OnFailed();
-  base::ProcessHandle process = utility_process_host_->GetData().handle;
   // Should reply with OnPageCount().
   Send(new ChromeUtilityMsg_RenderPDFPagesToMetafiles(
-      IPC::GetFileHandleForProcess(pdf->GetPlatformFile(), process, false),
+      IPC::GetPlatformFileForTransit(pdf->GetPlatformFile(), false),
       settings_));
 }
 
@@ -373,12 +372,11 @@ void PdfToEmfUtilityProcessHostClient::OnTempEmfReady(
     GetPageCallbackData* callback_data,
     ScopedTempFile emf) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (!utility_process_host_)
+  if (!utility_process_host_ || !emf)
     return OnFailed();
-  base::ProcessHandle process = utility_process_host_->GetData().handle;
   IPC::PlatformFileForTransit transit =
-      IPC::GetFileHandleForProcess(emf->GetPlatformFile(), process, false);
-  callback_data->set_emf(emf.Pass());
+      IPC::GetPlatformFileForTransit(emf->GetPlatformFile(), false);
+  callback_data->set_emf(std::move(emf));
   // Should reply with OnPageDone().
   Send(new ChromeUtilityMsg_RenderPDFPagesToMetafiles_GetPage(
       callback_data->page_number(), transit));
@@ -389,10 +387,16 @@ void PdfToEmfUtilityProcessHostClient::OnPageDone(bool success,
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (get_page_callbacks_.empty())
     return OnFailed();
-  std::unique_ptr<MetafilePlayer> emf;
   GetPageCallbackData& data = get_page_callbacks_.front();
-  if (success)
-    emf.reset(new LazyEmf(temp_dir_, data.emf().Pass()));
+  std::unique_ptr<MetafilePlayer> emf;
+
+  if (success) {
+    ScopedTempFile temp_emf = data.TakeEmf();
+    if (!temp_emf)  // Unexpected message from utility process.
+      return OnFailed();
+    emf.reset(new LazyEmf(temp_dir_, std::move(temp_emf)));
+  }
+
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&PdfToEmfConverterImpl::RunCallback,
diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc
index eeca453030ea..87971055e68f 100644
--- a/chromium_src/chrome/browser/printing/print_job.cc
+++ b/chromium_src/chrome/browser/printing/print_job.cc
@@ -306,7 +306,7 @@ void PrintJob::OnPdfToEmfPageConverted(int page_number,
 
   // Update the rendered document. It will send notifications to the listener.
   document_->SetPage(page_number,
-                     emf.Pass(),
+                     std::move(emf),
                      scale_factor,
                      ptd_to_emf_state_->page_size(),
                      ptd_to_emf_state_->content_area());
diff --git a/chromium_src/chrome/utility/printing_handler_win.cc b/chromium_src/chrome/utility/printing_handler_win.cc
index b0bbac523671..105e574f7358 100644
--- a/chromium_src/chrome/utility/printing_handler_win.cc
+++ b/chromium_src/chrome/utility/printing_handler_win.cc
@@ -53,7 +53,7 @@ void PrintingHandlerWin::OnRenderPDFPagesToMetafile(
     const PdfRenderSettings& settings) {
   pdf_rendering_settings_ = settings;
   base::File pdf_file = IPC::PlatformFileForTransitToFile(pdf_transit);
-  int page_count = LoadPDF(pdf_file.Pass());
+  int page_count = LoadPDF(std::move(pdf_file));
   //int page_count = 1;
   Send(
       new ChromeUtilityHostMsg_RenderPDFPagesToMetafiles_PageCount(page_count));
@@ -65,7 +65,7 @@ void PrintingHandlerWin::OnRenderPDFPagesToMetafileGetPage(
   base::File emf_file = IPC::PlatformFileForTransitToFile(output_file);
   float scale_factor = 1.0f;
   bool success =
-      RenderPdfPageToMetafile(page_number, emf_file.Pass(), &scale_factor);
+      RenderPdfPageToMetafile(page_number, std::move(emf_file), &scale_factor);
   Send(new ChromeUtilityHostMsg_RenderPDFPagesToMetafiles_PageDone(
       success, scale_factor));
 }

From f756a3e682ec3f0fa111c768f7535c5caa5387d1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 17:03:49 +0900
Subject: [PATCH 342/510] Fix crash when quitting

---
 atom/browser/api/trackable_object.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/atom/browser/api/trackable_object.h b/atom/browser/api/trackable_object.h
index a5ed593a6ba6..bbed54754002 100644
--- a/atom/browser/api/trackable_object.h
+++ b/atom/browser/api/trackable_object.h
@@ -113,7 +113,7 @@ class TrackableObject : public TrackableObjectBase,
 
   void AfterInit(v8::Isolate* isolate) override {
     if (!weak_map_) {
-      weak_map_.reset(new atom::KeyWeakMap<int32_t>);
+      weak_map_ = new atom::KeyWeakMap<int32_t>;
     }
     weak_map_id_ = ++next_id_;
     weak_map_->Set(isolate, weak_map_id_, Wrappable<T>::GetWrapper());
@@ -123,7 +123,7 @@ class TrackableObject : public TrackableObjectBase,
 
  private:
   static int32_t next_id_;
-  static std::unique_ptr<atom::KeyWeakMap<int32_t>> weak_map_;
+  static atom::KeyWeakMap<int32_t>* weak_map_;  // leaked on purpose
 
   DISALLOW_COPY_AND_ASSIGN(TrackableObject);
 };
@@ -132,7 +132,7 @@ template<typename T>
 int32_t TrackableObject<T>::next_id_ = 0;
 
 template<typename T>
-std::unique_ptr<atom::KeyWeakMap<int32_t>> TrackableObject<T>::weak_map_;
+atom::KeyWeakMap<int32_t>* TrackableObject<T>::weak_map_ = nullptr;
 
 }  // namespace mate
 

From 208acd1b9c59b33d9c14f8c1b00b4e7ace15229d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 19:02:40 +0900
Subject: [PATCH 343/510] Update brightray: Manage NetLog in BrowserClient

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index 7e685c19fd76..cf409eed8ff9 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 7e685c19fd7600ce360c55ac5ee80d621849214f
+Subproject commit cf409eed8ff985df7c6fca101217526c2fdc152c

From badecb49f372e72066d8726da6945b0427c9165b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 19:50:05 +0900
Subject: [PATCH 344/510] Update brightray: fix Linux linking problem

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index cf409eed8ff9..8dfef9c08def 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit cf409eed8ff985df7c6fca101217526c2fdc152c
+Subproject commit 8dfef9c08defd90d018594a4dda391ff536479a2

From fca91db1334819fb2efa69798486ac99ee091383 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 21:08:16 +0900
Subject: [PATCH 345/510] Fix showing context menu in devtools

---
 atom/browser/api/atom_api_menu_mac.mm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index 84a8a2a01965..70e814a29d70 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -7,6 +7,8 @@
 #include "atom/browser/native_window.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
+#include "brightray/browser/inspectable_web_contents.h"
+#include "brightray/browser/inspectable_web_contents_view.h"
 #include "content/public/browser/web_contents.h"
 
 #include "atom/common/node_includes.h"
@@ -22,14 +24,15 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
   NativeWindow* native_window = window->window();
   if (!native_window)
     return;
-  content::WebContents* web_contents = native_window->web_contents();
+  brightray::InspectableWebContents* web_contents =
+      native_window->inspectable_web_contents();
   if (!web_contents)
     return;
 
   base::scoped_nsobject<AtomMenuController> menu_controller(
       [[AtomMenuController alloc] initWithModel:model_.get()]);
   NSMenu* menu = [menu_controller menu];
-  NSView* view = web_contents->GetContentNativeView();
+  NSView* view = web_contents->GetView()->GetNativeView();
 
   // Which menu item to show.
   NSMenuItem* item = nil;

From b866b34ac8f341f1d0c5bdaf9f4f36fc5c584a73 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 21:53:50 +0900
Subject: [PATCH 346/510] The unit of position is CGFloat

---
 atom/browser/api/atom_api_menu_mac.mm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index 70e814a29d70..56a004510554 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -51,15 +51,15 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
 
   // If no preferred item is specified, try to show all of the menu items.
   if (!positioning_item) {
-    int windowBottom = CGRectGetMinY([view window].frame);
-    int distaceFromBottom = windowBottom + position.y - [menu size].height;
+    CGFloat windowBottom = CGRectGetMinY([view window].frame);
+    CGFloat distaceFromBottom = windowBottom + position.y - [menu size].height;
     if (distaceFromBottom < 0)
       position.y = position.y - distaceFromBottom;
   }
 
   // Place the menu left of cursor if it is overflowing off right of screen.
-  int windowLeft = CGRectGetMinX([view window].frame);
-  int rightmostPoint = windowLeft + position.x + [menu size].width;
+  CGFloat windowLeft = CGRectGetMinX([view window].frame);
+  CGFloat rightmostPoint = windowLeft + position.x + [menu size].width;
   if (rightmostPoint > [[NSScreen mainScreen] visibleFrame].size.width)
     position.x = position.x - [menu size].width;
 

From 0d4f1abdf92bdb02a91fb51cdde06106cc3c59a2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 21:54:06 +0900
Subject: [PATCH 347/510] Move the menu sightly higher when repositioning the
 menu

Otherwise the menu is not able to show the last menu item and the arrow
will show.
---
 atom/browser/api/atom_api_menu_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index 56a004510554..117e8c0df7ed 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -54,7 +54,7 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
     CGFloat windowBottom = CGRectGetMinY([view window].frame);
     CGFloat distaceFromBottom = windowBottom + position.y - [menu size].height;
     if (distaceFromBottom < 0)
-      position.y = position.y - distaceFromBottom;
+      position.y = position.y - distaceFromBottom + 4;
   }
 
   // Place the menu left of cursor if it is overflowing off right of screen.

From 2edf55957112d2edd80e152dae85449b28b11f3d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 22:05:26 +0900
Subject: [PATCH 348/510] Update brightray: fix OS X linking problem

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index 8dfef9c08def..7b6d8eb43e46 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 8dfef9c08defd90d018594a4dda391ff536479a2
+Subproject commit 7b6d8eb43e46146db544aba4a1dc69d88b98b3ab

From 2208b8bd6e0ea0b01543aa9085e2c2f35f174efb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 22:53:50 +0900
Subject: [PATCH 349/510] Update symbol names of icu

---
 common.gypi      | 41 +++++++++++++++++++++--------------------
 vendor/brightray |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/common.gypi b/common.gypi
index 6d5558257848..29fe70afc02c 100644
--- a/common.gypi
+++ b/common.gypi
@@ -147,29 +147,30 @@
                   'conditions': [
                     ['target_arch=="ia32"', {
                       'reference_symbols': [
-                        '_u_errorName_54',
-                        '_ubidi_setPara_54',
-                        '_ucsdet_getName_54',
-                        '_uidna_openUTS46_54',
-                        '_ulocdata_close_54',
-                        '_unorm_normalize_54',
-                        '_uregex_matches_54',
-                        '_uscript_getCode_54',
-                        '_usearch_setPattern_54',
-                        '?createInstance@Transliterator@icu_54@@SAPAV12@ABVUnicodeString@2@W4UTransDirection@@AAW4UErrorCode@@@Z',
+                        '_u_errorName_56',
+                        '_ubidi_setPara_56',
+                        '_ucsdet_getName_56',
+                        '_uidna_openUTS46_56',
+                        '_ulocdata_close_56',
+                        '_unorm_normalize_56',
+                        '_uregex_matches_56',
+                        '_uscript_getCode_56',
+                        '_uspoof_open_56',
+                        '_usearch_setPattern_56',
+                        '?createInstance@Transliterator@icu_56@@SAPAV12@ABVUnicodeString@2@W4UTransDirection@@AAW4UErrorCode@@@Z',
                       ],
                     }, {
                       'reference_symbols': [
-                        'u_errorName_54',
-                        'ubidi_setPara_54',
-                        'ucsdet_getName_54',
-                        'uidna_openUTS46_54',
-                        'ulocdata_close_54',
-                        'unorm_normalize_54',
-                        'uregex_matches_54',
-                        'uscript_getCode_54',
-                        'usearch_setPattern_54',
-                        '?createInstance@Transliterator@icu_54@@SAPEAV12@AEBVUnicodeString@2@W4UTransDirection@@AEAW4UErrorCode@@@Z',
+                        'u_errorName_56',
+                        'ubidi_setPara_56',
+                        'ucsdet_getName_56',
+                        'uidna_openUTS46_56',
+                        'ulocdata_close_56',
+                        'unorm_normalize_56',
+                        'uregex_matches_56',
+                        'uspoof_open_56',
+                        'usearch_setPattern_56',
+                        '?createInstance@Transliterator@icu_56@@SAPEAV12@AEBVUnicodeString@2@W4UTransDirection@@AEAW4UErrorCode@@@Z',
                       ],
                     }],
                   ],
diff --git a/vendor/brightray b/vendor/brightray
index 7b6d8eb43e46..fce067277179 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 7b6d8eb43e46146db544aba4a1dc69d88b98b3ab
+Subproject commit fce0672771792023ef66e180db48a894bc132c7d

From 37a4267450f558dc753d37e57bc41866b18fb94c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 23:24:43 +0900
Subject: [PATCH 350/510] Update brightray: fix Windows linking problem

---
 vendor/brightray | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/brightray b/vendor/brightray
index fce067277179..8baf0b10bdf9 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit fce0672771792023ef66e180db48a894bc132c7d
+Subproject commit 8baf0b10bdf9c649463ee0b7c7f7a34c0332c285

From 3402c7be3f96ed5186fb8c418acd37355bd73f27 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 23 May 2016 23:31:00 +0900
Subject: [PATCH 351/510] Suppress ffi test on Windows

---
 spec/modules-spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/modules-spec.js b/spec/modules-spec.js
index 0f694e5e6d80..fbc66a082512 100644
--- a/spec/modules-spec.js
+++ b/spec/modules-spec.js
@@ -23,6 +23,8 @@ describe('third-party module', function () {
     })
 
     describe('ffi', function () {
+      if (process.platform === 'win32') return
+
       it('does not crash', function () {
         var ffi = require('ffi')
         var libm = ffi.Library('libm', {

From 5010150c8cc39a8233e0f1cfec6ddcf4f9dea5b3 Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Mon, 23 May 2016 12:17:43 -0400
Subject: [PATCH 352/510] :memo: Mention that x and y have to be used together
 when creating new window [ci skip]

---
 docs/api/browser-window.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 0bd38dec560e..b8d379a916ad 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -33,10 +33,10 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
 * `options` Object
   * `width` Integer - Window's width in pixels. Default is `800`.
   * `height` Integer - Window's height in pixels. Default is `600`.
-  * `x` Integer - Window's left offset from screen. Default is to center the
-    window.
-  * `y` Integer - Window's top offset from screen. Default is to center the
-    window.
+  * `x` Integer (**required** if y is used) - Window's left offset from screen.
+    Default is to center the window.
+  * `y` Integer (**required** if x is used) - Window's top offset from screen.
+    Default is to center the window.
   * `useContentSize` Boolean - The `width` and `height` would be used as web
     page's size, which means the actual window's size will include window
     frame's size and be slightly larger. Default is `false`.

From 58d9d2cf41d07e0f105e50e0bafe734b879c116d Mon Sep 17 00:00:00 2001
From: Matt Karl <matt.karl@jibo.com>
Date: Mon, 23 May 2016 15:00:55 -0400
Subject: [PATCH 353/510] Adds JSON parse, invalid and missing main field
 errors

---
 default_app/main.js | 51 +++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index 9c75a23d6fc2..cc3e48c6e344 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -234,7 +234,13 @@ function loadApplicationPackage (packagePath) {
     packagePath = path.resolve(packagePath)
     const packageJsonPath = path.join(packagePath, 'package.json')
     if (fs.existsSync(packageJsonPath)) {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
+      let packageJson
+      try {
+        packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
+      } catch (e) {
+        showErrorMessage('Unable to parse package.json, it contains errors.\n\n' +
+          `${e.toString()} in ${packageJsonPath}`)
+      }
       if (packageJson.version) app.setVersion(packageJson.version)
 
       if (packageJson.productName) {
@@ -242,28 +248,27 @@ function loadApplicationPackage (packagePath) {
       } else if (packageJson.name) {
         app.setName(packageJson.name)
       }
-
+      if (!packageJson.main) {
+        showErrorMessage('App is missing \'main\' property in package.json.\n\n' +
+          `See: ${packageJsonPath}`)
+      }
       app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
       app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
       app.setAppPath(packagePath)
     }
-
+    const Module = require('module')
+    try {
+      Module._resolveFilename(packagePath, module, true)
+    } catch (e) {
+      showErrorMessage('Unable to find Electron app.\n\n' +
+        `See: ${packagePath}`)
+    }
     // Run the app.
-    require('module')._load(packagePath, module, true)
+    Module._load(packagePath, module, true)
   } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') {
-      app.focus()
-      dialog.showMessageBox({
-        message: 'Error opening app',
-        detail: 'Unable to open or find an Electron app.\n\n' +
-            `${e.toString()}`,
-        buttons: ['OK', 'Learn More']
-      }, (response) => {
-        if (response === 1) {
-          shell.openExternal('http://electron.atom.io/docs')
-        }
-      })
-      process.exit(1)
+      showErrorMessage('Unable to open Electron app.\n\n' +
+        `${e.toString()}`)
     } else {
       console.error('App threw an error when running', e)
       throw e
@@ -271,6 +276,20 @@ function loadApplicationPackage (packagePath) {
   }
 }
 
+function showErrorMessage (message) {
+  app.focus()
+  dialog.showMessageBox({
+    message: 'Error opening app',
+    detail: message,
+    buttons: ['OK', 'Learn More']
+  }, (response) => {
+    if (response === 1) {
+      shell.openExternal('http://electron.atom.io/docs')
+    }
+  })
+  process.exit(1)
+}
+
 function loadApplicationByUrl (appUrl) {
   require('./default_app').load(appUrl)
 }

From 52888c97b50111226b1e11344f32733aa9668ce3 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Mon, 23 May 2016 12:37:47 -0700
Subject: [PATCH 354/510] Add a Windows script to just invoke cibuild

---
 script/cibuild.ps1 | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 script/cibuild.ps1

diff --git a/script/cibuild.ps1 b/script/cibuild.ps1
new file mode 100644
index 000000000000..b06d48d1a8be
--- /dev/null
+++ b/script/cibuild.ps1
@@ -0,0 +1,2 @@
+$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
+& python "$scriptPath/cibuild"

From ee61a2880ab0b45ccc978fb37c3d8ad886e50397 Mon Sep 17 00:00:00 2001
From: Matt Karl <matt.karl@jibo.com>
Date: Mon, 23 May 2016 16:47:55 -0400
Subject: [PATCH 355/510] Removes main error, fixes messaging for JSON parse

---
 default_app/main.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index cc3e48c6e344..e9b744c603ff 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -238,7 +238,7 @@ function loadApplicationPackage (packagePath) {
       try {
         packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
       } catch (e) {
-        showErrorMessage('Unable to parse package.json, it contains errors.\n\n' +
+        showErrorMessage('Unable to parse package.json.\n\n' +
           `${e.toString()} in ${packageJsonPath}`)
       }
       if (packageJson.version) app.setVersion(packageJson.version)
@@ -248,10 +248,6 @@ function loadApplicationPackage (packagePath) {
       } else if (packageJson.name) {
         app.setName(packageJson.name)
       }
-      if (!packageJson.main) {
-        showErrorMessage('App is missing \'main\' property in package.json.\n\n' +
-          `See: ${packageJsonPath}`)
-      }
       app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
       app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
       app.setAppPath(packagePath)

From f3af1dbd543487e3c57cb0286c5e2b92de27cfbc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 15:06:46 -0700
Subject: [PATCH 356/510] Add failing spec for rejected remote promise

---
 spec/api-ipc-spec.js                     | 16 ++++++++++++++++
 spec/fixtures/module/rejected-promise.js |  5 +++++
 2 files changed, 21 insertions(+)
 create mode 100644 spec/fixtures/module/rejected-promise.js

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index 008a97f3aaca..102b23ece567 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -106,6 +106,22 @@ describe('ipc module', function () {
         done()
       })
     })
+
+    it('handles rejections via catch(onRejected)', function (done) {
+      var promise = remote.require(path.join(fixtures, 'module', 'rejected-promise.js'))
+      promise.reject(Promise.resolve(1234)).catch(function (error) {
+        assert.equal(error.message, 'rejected')
+        done()
+      })
+    })
+
+    it('handles rejections via then(onFulfilled, onRejected)', function (done) {
+      var promise = remote.require(path.join(fixtures, 'module', 'rejected-promise.js'))
+      promise.reject(Promise.resolve(1234)).then(function () {}, function (error) {
+        assert.equal(error.message, 'rejected')
+        done()
+      })
+    })
   })
 
   describe('remote webContents', function () {
diff --git a/spec/fixtures/module/rejected-promise.js b/spec/fixtures/module/rejected-promise.js
new file mode 100644
index 000000000000..93dd9accc030
--- /dev/null
+++ b/spec/fixtures/module/rejected-promise.js
@@ -0,0 +1,5 @@
+exports.reject = function (promise) {
+  return promise.then(function () {
+    throw Error('rejected')
+  })
+}

From 7929daa48c0eb69649f62bbbde21e9bfd6c56e7a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 15:07:01 -0700
Subject: [PATCH 357/510] Pass both callback values to then

---
 lib/browser/rpc-server.js  | 4 +++-
 lib/renderer/api/remote.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index 8fdb77a6cdca..7ad6d2c22aef 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -91,7 +91,9 @@ let valueToMeta = function (sender, value, optimizeSimpleObject = false) {
   } else if (meta.type === 'buffer') {
     meta.value = Array.prototype.slice.call(value, 0)
   } else if (meta.type === 'promise') {
-    meta.then = valueToMeta(sender, function (v) { value.then(v) })
+    meta.then = valueToMeta(sender, function (onFulfilled, onRejected) {
+      value.then(onFulfilled, onRejected)
+    })
   } else if (meta.type === 'error') {
     meta.members = plainObjectToMeta(value)
 
diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index b6a0859a9c1d..d3fdec25aeb7 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -47,7 +47,9 @@ var wrapArgs = function (args, visited) {
       if (value.constructor != null && value.constructor.name === 'Promise') {
         return {
           type: 'promise',
-          then: valueToMeta(function (v) { value.then(v) })
+          then: valueToMeta(function (onFulfilled, onRejected) {
+            value.then(onFulfilled, onRejected)
+          })
         }
       } else if (v8Util.getHiddenValue(value, 'atomId')) {
         return {

From daea448b6138b1e80315f1105e41f2c3e060c2c6 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 10:28:32 -0700
Subject: [PATCH 358/510] .coffee -> .js

---
 lib/common/asar_init.js          | 2 +-
 lib/common/reset-search-paths.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/common/asar_init.js b/lib/common/asar_init.js
index 13ee449a42c0..b8488aefb3ca 100644
--- a/lib/common/asar_init.js
+++ b/lib/common/asar_init.js
@@ -1,6 +1,6 @@
 ;(function () {
   return function (process, require, asarSource) {
-    // Make asar.coffee accessible via "require".
+    // Make asar.js accessible via "require".
     process.binding('natives').ELECTRON_ASAR = asarSource
 
     // Monkey-patch the fs module.
diff --git a/lib/common/reset-search-paths.js b/lib/common/reset-search-paths.js
index 30709b56a78c..24cbf142666d 100644
--- a/lib/common/reset-search-paths.js
+++ b/lib/common/reset-search-paths.js
@@ -4,7 +4,7 @@ const Module = require('module')
 // Clear Node's global search paths.
 Module.globalPaths.length = 0
 
-// Clear current and parent(init.coffee)'s search paths.
+// Clear current and parent(init.js)'s search paths.
 module.paths = []
 
 module.parent.paths = []

From 566b0676bce5f53fd4c0572518462bd36a0e3c61 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 10:56:49 -0700
Subject: [PATCH 359/510] Pre-resolve electron require path

---
 lib/common/reset-search-paths.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/common/reset-search-paths.js b/lib/common/reset-search-paths.js
index 24cbf142666d..c53364a2a14f 100644
--- a/lib/common/reset-search-paths.js
+++ b/lib/common/reset-search-paths.js
@@ -17,7 +17,7 @@ Module._nodeModulePaths = function (from) {
   // If "from" is outside the app then we do nothing.
   skipOutsidePaths = from.startsWith(process.resourcesPath)
 
-  // Following logoic is copied from module.js.
+  // Following logic is copied from module.js.
   splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//
   paths = []
   parts = from.split(splitRe)
@@ -34,3 +34,13 @@ Module._nodeModulePaths = function (from) {
   }
   return paths
 }
+
+const electronPath = path.join(__dirname, '..', process.type, 'api', 'exports', 'electron.js')
+const originalResolveFilename = Module._resolveFilename
+Module._resolveFilename = function (request, parent, isMain) {
+  if (request === 'electron') {
+    return electronPath
+  } else {
+    return originalResolveFilename(request, parent, isMain)
+  }
+}

From 19fd841c3060953166533bdbf22d0ea6750618a9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 10:58:33 -0700
Subject: [PATCH 360/510] :art:

---
 lib/common/reset-search-paths.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/common/reset-search-paths.js b/lib/common/reset-search-paths.js
index c53364a2a14f..bdd2125d5b4c 100644
--- a/lib/common/reset-search-paths.js
+++ b/lib/common/reset-search-paths.js
@@ -6,27 +6,26 @@ Module.globalPaths.length = 0
 
 // Clear current and parent(init.js)'s search paths.
 module.paths = []
-
 module.parent.paths = []
 
 // Prevent Node from adding paths outside this app to search paths.
 Module._nodeModulePaths = function (from) {
-  var dir, i, part, parts, paths, skipOutsidePaths, splitRe, tip
   from = path.resolve(from)
 
   // If "from" is outside the app then we do nothing.
-  skipOutsidePaths = from.startsWith(process.resourcesPath)
+  const skipOutsidePaths = from.startsWith(process.resourcesPath)
 
   // Following logic is copied from module.js.
-  splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//
-  paths = []
-  parts = from.split(splitRe)
-  for (tip = i = parts.length - 1; i >= 0; tip = i += -1) {
-    part = parts[tip]
+  const splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//
+  const paths = []
+  const parts = from.split(splitRe)
+
+  for (let tip = i = parts.length - 1; i >= 0; tip = i += -1) {
+    const part = parts[tip]
     if (part === 'node_modules') {
       continue
     }
-    dir = parts.slice(0, tip + 1).join(path.sep)
+    const dir = parts.slice(0, tip + 1).join(path.sep)
     if (skipOutsidePaths && !dir.startsWith(process.resourcesPath)) {
       break
     }

From fe0ec676239589f0af6e65a633d303705447a717 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 11:19:33 -0700
Subject: [PATCH 361/510] Add spec for electron module require

---
 .../api/electron-module-app/index.html        | 13 ++++++++
 .../node_modules/electron/index.js            |  0
 .../node_modules/electron/package.json        |  4 +++
 spec/node-spec.js                             | 32 ++++++++++++++++++-
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/api/electron-module-app/index.html
 create mode 100644 spec/fixtures/api/electron-module-app/node_modules/electron/index.js
 create mode 100644 spec/fixtures/api/electron-module-app/node_modules/electron/package.json

diff --git a/spec/fixtures/api/electron-module-app/index.html b/spec/fixtures/api/electron-module-app/index.html
new file mode 100644
index 000000000000..1394125534a6
--- /dev/null
+++ b/spec/fixtures/api/electron-module-app/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script>
+      require('electron').ipcRenderer.send('answer')
+    </script>
+  </head>
+  <body>
+
+  </body>
+</html>
diff --git a/spec/fixtures/api/electron-module-app/node_modules/electron/index.js b/spec/fixtures/api/electron-module-app/node_modules/electron/index.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/spec/fixtures/api/electron-module-app/node_modules/electron/package.json b/spec/fixtures/api/electron-module-app/node_modules/electron/package.json
new file mode 100644
index 000000000000..07e3804ebb16
--- /dev/null
+++ b/spec/fixtures/api/electron-module-app/node_modules/electron/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "electron",
+  "main": "index.js"
+}
diff --git a/spec/node-spec.js b/spec/node-spec.js
index 0ab98aa67ab9..344017e47ea6 100644
--- a/spec/node-spec.js
+++ b/spec/node-spec.js
@@ -3,7 +3,8 @@ const child_process = require('child_process')
 const fs = require('fs')
 const path = require('path')
 const os = require('os')
-const remote = require('electron').remote
+const {remote} = require('electron')
+const {BrowserWindow, ipcMain} = remote
 
 describe('node feature', function () {
   var fixtures = path.join(__dirname, 'fixtures')
@@ -228,4 +229,33 @@ describe('node feature', function () {
       require('vm').runInNewContext('')
     })
   })
+
+  describe.only('require("electron")', function () {
+    let window = null
+
+    beforeEach(function () {
+      if (window != null) {
+        window.destroy()
+      }
+      window = new BrowserWindow({
+        show: false,
+        width: 400,
+        height: 400
+      })
+    })
+
+    afterEach(function () {
+      if (window != null) {
+        window.destroy()
+      }
+      window = null
+    })
+
+    it('always returns the internal electron module', function (done) {
+      ipcMain.once('answer', function () {
+        done()
+      })
+      window.loadURL('file://' + path.join(__dirname, 'fixtures', 'api', 'electron-module-app', 'index.html'))
+    })
+  })
 })

From 6ac0151e6594853be58092ba6f49a9ad77e3e0ed Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 11:31:56 -0700
Subject: [PATCH 362/510] Remove lint warnings

---
 lib/common/reset-search-paths.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/common/reset-search-paths.js b/lib/common/reset-search-paths.js
index bdd2125d5b4c..72449559b224 100644
--- a/lib/common/reset-search-paths.js
+++ b/lib/common/reset-search-paths.js
@@ -20,7 +20,9 @@ Module._nodeModulePaths = function (from) {
   const paths = []
   const parts = from.split(splitRe)
 
-  for (let tip = i = parts.length - 1; i >= 0; tip = i += -1) {
+  let tip
+  let i
+  for (tip = i = parts.length - 1; i >= 0; tip = i += -1) {
     const part = parts[tip]
     if (part === 'node_modules') {
       continue

From 4a413114092c539d9d3ece90ce2b536bafe835a5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 13:09:39 -0700
Subject: [PATCH 363/510] Test that calling regular module succeeds

---
 spec/fixtures/api/electron-module-app/index.html              | 1 +
 .../api/electron-module-app/node_modules/foo/index.js         | 1 +
 .../api/electron-module-app/node_modules/foo/package.json     | 4 ++++
 spec/node-spec.js                                             | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/api/electron-module-app/node_modules/foo/index.js
 create mode 100644 spec/fixtures/api/electron-module-app/node_modules/foo/package.json

diff --git a/spec/fixtures/api/electron-module-app/index.html b/spec/fixtures/api/electron-module-app/index.html
index 1394125534a6..02bfee958747 100644
--- a/spec/fixtures/api/electron-module-app/index.html
+++ b/spec/fixtures/api/electron-module-app/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <title></title>
     <script>
+      require('foo').bar()
       require('electron').ipcRenderer.send('answer')
     </script>
   </head>
diff --git a/spec/fixtures/api/electron-module-app/node_modules/foo/index.js b/spec/fixtures/api/electron-module-app/node_modules/foo/index.js
new file mode 100644
index 000000000000..11d763e51742
--- /dev/null
+++ b/spec/fixtures/api/electron-module-app/node_modules/foo/index.js
@@ -0,0 +1 @@
+exports.bar = function () {}
diff --git a/spec/fixtures/api/electron-module-app/node_modules/foo/package.json b/spec/fixtures/api/electron-module-app/node_modules/foo/package.json
new file mode 100644
index 000000000000..596ac286ecad
--- /dev/null
+++ b/spec/fixtures/api/electron-module-app/node_modules/foo/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "foo",
+  "main": "index.js"
+}
diff --git a/spec/node-spec.js b/spec/node-spec.js
index 344017e47ea6..a164288f7904 100644
--- a/spec/node-spec.js
+++ b/spec/node-spec.js
@@ -230,7 +230,7 @@ describe('node feature', function () {
     })
   })
 
-  describe.only('require("electron")', function () {
+  describe('require("electron")', function () {
     let window = null
 
     beforeEach(function () {

From 5e2f36387f09e53b07e365a3baa47637704e22a5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 13:12:02 -0700
Subject: [PATCH 364/510] Move require spec to api-app-spec

---
 spec/api-app-spec.js | 35 ++++++++++++++++++++++++++++++++---
 spec/node-spec.js    | 30 ------------------------------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js
index c0469cc3f68f..df356ecb9053 100644
--- a/spec/api-app-spec.js
+++ b/spec/api-app-spec.js
@@ -3,10 +3,9 @@ const ChildProcess = require('child_process')
 const https = require('https')
 const fs = require('fs')
 const path = require('path')
-const remote = require('electron').remote
+const {remote} = require('electron')
 
-const app = remote.require('electron').app
-const BrowserWindow = remote.require('electron').BrowserWindow
+const {app, BrowserWindow, ipcMain} = remote
 const isCI = remote.getGlobal('isCi')
 
 describe('electron module', function () {
@@ -15,6 +14,36 @@ describe('electron module', function () {
       require('clipboard')
     }, /Cannot find module 'clipboard'/)
   })
+
+  describe('require("electron")', function () {
+    let window = null
+
+    beforeEach(function () {
+      if (window != null) {
+        window.destroy()
+      }
+      window = new BrowserWindow({
+        show: false,
+        width: 400,
+        height: 400
+      })
+    })
+
+    afterEach(function () {
+      if (window != null) {
+        window.destroy()
+      }
+      window = null
+    })
+
+    it('always returns the internal electron module', function (done) {
+      ipcMain.once('answer', function () {
+        done()
+      })
+      window.loadURL('file://' + path.join(__dirname, 'fixtures', 'api', 'electron-module-app', 'index.html'))
+    })
+  })
+
 })
 
 describe('app module', function () {
diff --git a/spec/node-spec.js b/spec/node-spec.js
index a164288f7904..71fdbac98664 100644
--- a/spec/node-spec.js
+++ b/spec/node-spec.js
@@ -4,7 +4,6 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 const {remote} = require('electron')
-const {BrowserWindow, ipcMain} = remote
 
 describe('node feature', function () {
   var fixtures = path.join(__dirname, 'fixtures')
@@ -229,33 +228,4 @@ describe('node feature', function () {
       require('vm').runInNewContext('')
     })
   })
-
-  describe('require("electron")', function () {
-    let window = null
-
-    beforeEach(function () {
-      if (window != null) {
-        window.destroy()
-      }
-      window = new BrowserWindow({
-        show: false,
-        width: 400,
-        height: 400
-      })
-    })
-
-    afterEach(function () {
-      if (window != null) {
-        window.destroy()
-      }
-      window = null
-    })
-
-    it('always returns the internal electron module', function (done) {
-      ipcMain.once('answer', function () {
-        done()
-      })
-      window.loadURL('file://' + path.join(__dirname, 'fixtures', 'api', 'electron-module-app', 'index.html'))
-    })
-  })
 })

From a4f94b89b4791ff42df88d4a869f0ee47b2255dc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 15:15:39 -0700
Subject: [PATCH 365/510] Add comment about Module path

---
 lib/common/reset-search-paths.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/common/reset-search-paths.js b/lib/common/reset-search-paths.js
index 72449559b224..4d09f6c89ca6 100644
--- a/lib/common/reset-search-paths.js
+++ b/lib/common/reset-search-paths.js
@@ -36,6 +36,8 @@ Module._nodeModulePaths = function (from) {
   return paths
 }
 
+// Patch Module._resolveFilename to always require the Electron API when
+// require('electron') is done.
 const electronPath = path.join(__dirname, '..', process.type, 'api', 'exports', 'electron.js')
 const originalResolveFilename = Module._resolveFilename
 Module._resolveFilename = function (request, parent, isMain) {

From 677a3172741d468c2c94923c35adbfb8131fbf3c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 23 May 2016 15:47:07 -0700
Subject: [PATCH 366/510] Strip ffmpeg in zip file

---
 script/create-dist.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/script/create-dist.py b/script/create-dist.py
index 4601f6df564d..6602cbf2c143 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -124,13 +124,17 @@ def copy_license():
 
 
 def strip_binaries():
-  if get_target_arch() == 'arm':
-    strip = 'arm-linux-gnueabihf-strip'
-  else:
-    strip = 'strip'
   for binary in TARGET_BINARIES[PLATFORM]:
     if binary.endswith('.so') or '.' not in binary:
-      execute([strip, os.path.join(DIST_DIR, binary)])
+      strip_binary(os.path.join(DIST_DIR, binary))
+
+
+def strip_binary(binary_path):
+    if get_target_arch() == 'arm':
+      strip = 'arm-linux-gnueabihf-strip'
+    else:
+      strip = 'strip'
+    execute([strip, binary_path])
 
 
 def create_version():
@@ -191,6 +195,10 @@ def create_ffmpeg_zip():
 
   shutil.copy2(os.path.join(CHROMIUM_DIR, '..', 'ffmpeg', ffmpeg_name),
                DIST_DIR)
+
+  if PLATFORM == 'linux':
+    strip_binary(os.path.join(DIST_DIR, ffmpeg_name))
+
   with scoped_cwd(DIST_DIR):
     make_zip(zip_file, [ffmpeg_name, 'LICENSE', 'LICENSES.chromium.html'], [])
 

From 1dd98171f4a0cc3a1f895412250102c1eb343d0a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 24 May 2016 15:59:21 +0900
Subject: [PATCH 367/510] Bump v1.1.2

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 2 +-
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index fbeac2a7f5e8..537cb3c1571e 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.1.1</string>
+  <string>1.1.2</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.1</string>
+  <string>1.1.2</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 7b0ce5d4a67c..2e4af3997b9d 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
- PRODUCTVERSION 1,1,1,0
+ FILEVERSION 1,1,2,0
+ PRODUCTVERSION 1,1,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.1.1"
+            VALUE "FileVersion", "1.1.2"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.1.1"
+            VALUE "ProductVersion", "1.1.2"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index 910e69059833..f62faf5f4482 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 1
-#define ATOM_PATCH_VERSION 1
+#define ATOM_PATCH_VERSION 2
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index be6104531827..a4f48b922ad3 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.1.1',
+    'version%': '1.1.2',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index 2bb700e99cd5..89837aa70f21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From 2a7590529ed1b34f2e972010c091e9ba5cb08ffa Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Mon, 23 May 2016 17:32:33 -0700
Subject: [PATCH 368/510] :memo: Update Windows Build Instructions

Closes #5655
---
 .../ko-KR/development/build-instructions-windows.md   |  8 ++++----
 .../zh-CN/development/build-instructions-windows.md   | 10 +++++-----
 docs/development/build-instructions-windows.md        | 11 +++++------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs-translations/ko-KR/development/build-instructions-windows.md b/docs-translations/ko-KR/development/build-instructions-windows.md
index e3804a410d36..4e4a9354d92c 100644
--- a/docs-translations/ko-KR/development/build-instructions-windows.md
+++ b/docs-translations/ko-KR/development/build-instructions-windows.md
@@ -5,7 +5,7 @@
 ## 빌드전 요구 사항
 
 * Windows 7 / Server 2008 R2 또는 최신 버전
-* Visual Studio 2013 Update 4 - [VS 2013 커뮤니티 에디션 무료 다운로드](https://www.visualstudio.com/news/vs2013-community-vs)
+* Visual Studio 2015 - [VS 2015 커뮤니티 에디션 무료 다운로드](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
 * [Python 2.7](http://www.python.org/download/releases/2.7/)
 * [Node.js](http://nodejs.org/download/)
 * [Git](http://git-scm.com)
@@ -21,7 +21,7 @@ Studio를 사용할 수 없습니다. 하지만 여전히 Electron을 개발할
 **참고:** Visual Studio가 직접 빌드에 사용되지 않더라도 IDE와 같이 제공된 빌드
 툴체인이 빌드에 **반드시** 사용되므로 여전히 필요합니다.
 
-**참고:** Visual Studio 2015는 사용할 수 없습니다 MSVS **2013** 을 사용하고 있는지
+**참고:** Visual Studio 2013는 사용할 수 없습니다 MSVS **2015** 을 사용하고 있는지
 확인해주세요.
 
 ## 코드 가져오기
@@ -97,7 +97,7 @@ $ python script\test.py -R
 ### Command xxxx not found
 
 만약 `Command xxxx not found`와 같은 형식의 에러가 발생했다면
-`VS2012 Command Prompt` 콘솔로 빌드 스크립트를 실행해볼 필요가 있습니다.
+`VS2015 Command Prompt` 콘솔로 빌드 스크립트를 실행해볼 필요가 있습니다.
 
 ### Fatal internal compiler error: C1001
 
@@ -146,4 +146,4 @@ $ mkdir ~\AppData\Roaming\npm
 ### node-gyp is not recognized as an internal or external command
 
 Git Bash로 빌드 했을 때 이러한 에러가 발생할 수 있습니다. 반드시 PowerShell이나
-VS2012 Command Prompt에서 빌드를 진행해야 합니다.
+VS2015 Command Prompt에서 빌드를 진행해야 합니다.
diff --git a/docs-translations/zh-CN/development/build-instructions-windows.md b/docs-translations/zh-CN/development/build-instructions-windows.md
index 2e2ee38638bf..4333620a560b 100644
--- a/docs-translations/zh-CN/development/build-instructions-windows.md
+++ b/docs-translations/zh-CN/development/build-instructions-windows.md
@@ -5,8 +5,8 @@
 ## 前提
 
 * Windows 7 / Server 2008 R2 or higher
-* Visual Studio 2013 with Update 4 - [download VS 2013 Community Edition for
-  free](https://www.visualstudio.com/news/vs2013-community-vs).
+* Visual Studio 2015 - [download VS 2015 Community Edition for
+  free](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
 * [Python 2.7](http://www.python.org/download/releases/2.7/)
 * [Node.js](http://nodejs.org/download/)
 * [Git](http://git-scm.com)
@@ -19,8 +19,8 @@
 **注意:** 虽然 Visual Studio 不是用来构建的，但是它仍然
 **必须的** ，因为我们需要它提供的构建工具栏.
 
-**注意:** Visual Studio 2015 不可用. 请确定使用 MSVS
-**2013**.
+**注意:** Visual Studio 2013 不可用. 请确定使用 MSVS
+**2015**.
 
 ## 获取代码
 
@@ -133,4 +133,4 @@ $ mkdir ~\AppData\Roaming\npm
 
 ### node-gyp is not recognized as an internal or external command
 
-如果你使用 Git Bash 来构建，或许会遇到这个错误，可以使用 PowerShell 或 VS2012 Command Prompt 来代替 .
\ No newline at end of file
+如果你使用 Git Bash 来构建，或许会遇到这个错误，可以使用 PowerShell 或 VS2015 Command Prompt 来代替 .
\ No newline at end of file
diff --git a/docs/development/build-instructions-windows.md b/docs/development/build-instructions-windows.md
index 3f94a18393cf..b3c2c4573462 100644
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -5,8 +5,8 @@ Follow the guidelines below for building Electron on Windows.
 ## Prerequisites
 
 * Windows 7 / Server 2008 R2 or higher
-* Visual Studio 2013 with Update 4 - [download VS 2013 Community Edition for
-  free](https://www.visualstudio.com/news/vs2013-community-vs).
+* Visual Studio 2015 - [download VS 2015 Community Edition for
+  free](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
 * [Python 2.7](http://www.python.org/download/releases/2.7/)
 * [Node.js](http://nodejs.org/download/)
 * [Git](http://git-scm.com)
@@ -22,8 +22,7 @@ building with Visual Studio will come in the future.
 **Note:** Even though Visual Studio is not used for building, it's still
 **required** because we need the build toolchains it provides.
 
-**Note:** Visual Studio 2015 will not work. Please make sure to get MSVS
-**2013**.
+**Note:** While older versions of Electron required Visual Studio 2013, Electron 1.1 and later does require Visual Studio 2015.
 
 ## Getting the Code
 
@@ -99,7 +98,7 @@ $ python script\test.py -R
 ### Command xxxx not found
 
 If you encountered an error like `Command xxxx not found`, you may try to use
-the `VS2012 Command Prompt` console to execute the build scripts.
+the `VS2015 Command Prompt` console to execute the build scripts.
 
 ### Fatal internal compiler error: C1001
 
@@ -148,4 +147,4 @@ $ mkdir ~\AppData\Roaming\npm
 ### node-gyp is not recognized as an internal or external command
 
 You may get this error if you are using Git Bash for building, you should use
-PowerShell or VS2012 Command Prompt instead.
+PowerShell or VS2015 Command Prompt instead.

From 67c88d2f8a95043f8b504454fba7d3f5bc504511 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:33:55 -0700
Subject: [PATCH 369/510] Move Module require to top

---
 default_app/main.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index e9b744c603ff..7c3b6b960609 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -1,6 +1,7 @@
 const {app, dialog, shell, Menu} = require('electron')
 
 const fs = require('fs')
+const Module = require('module')
 const path = require('path')
 const repl = require('repl')
 const url = require('url')
@@ -222,7 +223,7 @@ app.once('ready', () => {
 })
 
 if (option.modules.length > 0) {
-  require('module')._preloadModules(option.modules)
+  Module._preloadModules(option.modules)
 }
 
 function loadApplicationPackage (packagePath) {
@@ -252,7 +253,7 @@ function loadApplicationPackage (packagePath) {
       app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
       app.setAppPath(packagePath)
     }
-    const Module = require('module')
+
     try {
       Module._resolveFilename(packagePath, module, true)
     } catch (e) {

From f691a46d4dc6f754227d7f419905af9d132b6c38 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:37:52 -0700
Subject: [PATCH 370/510] Use dialog.showErrorBox

---
 default_app/main.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index 7c3b6b960609..e60c7d2615c4 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -275,15 +275,7 @@ function loadApplicationPackage (packagePath) {
 
 function showErrorMessage (message) {
   app.focus()
-  dialog.showMessageBox({
-    message: 'Error opening app',
-    detail: message,
-    buttons: ['OK', 'Learn More']
-  }, (response) => {
-    if (response === 1) {
-      shell.openExternal('http://electron.atom.io/docs')
-    }
-  })
+  dialog.showErrorBox('Error launching app', message)
   process.exit(1)
 }
 

From deb15e60b578e1576b1e6538f1e0a3e6355d3baf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:38:04 -0700
Subject: [PATCH 371/510] Lead with package.json path

---
 default_app/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index e60c7d2615c4..98fab26d2fd3 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -239,8 +239,8 @@ function loadApplicationPackage (packagePath) {
       try {
         packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
       } catch (e) {
-        showErrorMessage('Unable to parse package.json.\n\n' +
-          `${e.toString()} in ${packageJsonPath}`)
+        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`)
+        return
       }
       if (packageJson.version) app.setVersion(packageJson.version)
 

From 6de4249af8dc008daccb288bdddbeb23c2602b40 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:41:31 -0700
Subject: [PATCH 372/510] Tweak resolve filename error message

---
 default_app/main.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index 98fab26d2fd3..32461525aa4e 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -257,9 +257,10 @@ function loadApplicationPackage (packagePath) {
     try {
       Module._resolveFilename(packagePath, module, true)
     } catch (e) {
-      showErrorMessage('Unable to find Electron app.\n\n' +
-        `See: ${packagePath}`)
+      showErrorMessage(`Unable to find Electron app at ${packagePath}.\n\n${e.message}`)
+      return
     }
+
     // Run the app.
     Module._load(packagePath, module, true)
   } catch (e) {

From 4a352063026fde28eed48075a6e8119cca1049a0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:42:31 -0700
Subject: [PATCH 373/510] :art:

---
 default_app/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/default_app/main.js b/default_app/main.js
index 32461525aa4e..8fc9792fec49 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -242,8 +242,10 @@ function loadApplicationPackage (packagePath) {
         showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`)
         return
       }
-      if (packageJson.version) app.setVersion(packageJson.version)
 
+      if (packageJson.version) {
+        app.setVersion(packageJson.version)
+      }
       if (packageJson.productName) {
         app.setName(packageJson.productName)
       } else if (packageJson.name) {

From 63b84923ce5a8739363a4d2ea6e1d0d8b5d82acc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:43:25 -0700
Subject: [PATCH 374/510] Update copy

---
 default_app/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default_app/main.js b/default_app/main.js
index 8fc9792fec49..02f7a9fdd001 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -309,7 +309,7 @@ if (option.file && !option.webdriver) {
   console.log('v' + process.versions.electron)
   process.exit(0)
 } else if (option.help) {
-  const helpMessage = `Electron v${process.versions.electron} - Cross Platform Desktop Application Shell
+  const helpMessage = `Electron ${process.versions.electron} - Build cross platform desktop apps with JavaScript, HTML, and CSS
 
   Usage: electron [options] [path]
 

From 48522d4b70e4872184319cfe4e9197d01ced788f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:45:32 -0700
Subject: [PATCH 375/510] Remove custom MODULE_NOT_FOUND code check

---
 default_app/main.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index 02f7a9fdd001..e90c4667fb6b 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -266,13 +266,9 @@ function loadApplicationPackage (packagePath) {
     // Run the app.
     Module._load(packagePath, module, true)
   } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND') {
-      showErrorMessage('Unable to open Electron app.\n\n' +
-        `${e.toString()}`)
-    } else {
-      console.error('App threw an error when running', e)
-      throw e
-    }
+    console.error('App threw an error during load')
+    console.error(e)
+    throw e
   }
 }
 

From 74cde4e714eea16a30cd32ca5e77c69a9b4e8210 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:51:09 -0700
Subject: [PATCH 376/510] Log stack when available

---
 default_app/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default_app/main.js b/default_app/main.js
index e90c4667fb6b..58507c6900ea 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -267,7 +267,7 @@ function loadApplicationPackage (packagePath) {
     Module._load(packagePath, module, true)
   } catch (e) {
     console.error('App threw an error during load')
-    console.error(e)
+    console.error(e.stack || e)
     throw e
   }
 }

From ca72d4346b69d4f3fe04c5d1c39f1e30b05b492f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:53:23 -0700
Subject: [PATCH 377/510] application -> app for consitency

---
 default_app/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/default_app/main.js b/default_app/main.js
index 58507c6900ea..3cc1f4268640 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -309,8 +309,7 @@ if (option.file && !option.webdriver) {
 
   Usage: electron [options] [path]
 
-  A path to an Electron application may be specified.
-  The path must be one of the following:
+  A path to an Electron app may be specified. The path must be one of the following:
 
     - index.js file.
     - Folder containing a package.json file.

From 3e15021c125fe79b2a4d1c7ea695b588d0cab805 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 09:56:36 -0700
Subject: [PATCH 378/510] Remove . after path to prevent confusion

---
 default_app/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default_app/main.js b/default_app/main.js
index 3cc1f4268640..e26c70590b1a 100644
--- a/default_app/main.js
+++ b/default_app/main.js
@@ -259,7 +259,7 @@ function loadApplicationPackage (packagePath) {
     try {
       Module._resolveFilename(packagePath, module, true)
     } catch (e) {
-      showErrorMessage(`Unable to find Electron app at ${packagePath}.\n\n${e.message}`)
+      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`)
       return
     }
 

From b68d1ecb8313432604c8f48f4cb17e41bda175fd Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 10:17:57 -0700
Subject: [PATCH 379/510] Remove ATOM_SHELL_INTERNAL_RUN_AS_NODE support

---
 atom/app/atom_main.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
index be5339a6e0c3..be060ab4329a 100644
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -34,7 +34,6 @@
 namespace {
 
 const char* kRunAsNode = "ELECTRON_RUN_AS_NODE";
-const char* kOldRunAsNode = "ATOM_SHELL_INTERNAL_RUN_AS_NODE";
 
 bool IsEnvSet(const char* name) {
 #if defined(OS_WIN)
@@ -48,7 +47,7 @@ bool IsEnvSet(const char* name) {
 }
 
 bool IsRunAsNode() {
-  return IsEnvSet(kRunAsNode) || IsEnvSet(kOldRunAsNode);
+  return IsEnvSet(kRunAsNode);
 }
 
 }  // namespace

From 89538b19ee57f4e949bde889ad6f150999df21ec Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 10:42:09 -0700
Subject: [PATCH 380/510] Upgrade node for ELECTRON_RUN_AS_NODE change

---
 vendor/node | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/node b/vendor/node
index 454e37c47804..f23df7c224ae 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 454e37c47804706c5524d3639f18de02f5ad18c9
+Subproject commit f23df7c224ae5b67c1bc14a82a8020171308b47b

From eb0889de3816839741f15cbb0b4eee55930a50ad Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Mon, 23 May 2016 11:49:46 -0400
Subject: [PATCH 381/510] :apple: Add fallback URL to handoff.

---
 atom/browser/browser.h               |  4 +++-
 atom/browser/browser_mac.mm          | 19 ++++++++++++-------
 atom/browser/mac/atom_application.h  |  4 +++-
 atom/browser/mac/atom_application.mm |  4 +++-
 docs/api/app.md                      |  4 +++-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index 1c70eb875906..18d0c97c93ac 100644
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -14,6 +14,7 @@
 #include "base/strings/string16.h"
 #include "atom/browser/browser_observer.h"
 #include "atom/browser/window_list_observer.h"
+#include "native_mate/arguments.h"
 
 #if defined(OS_WIN)
 #include "base/files/file_path.h"
@@ -94,7 +95,8 @@ class Browser : public WindowListObserver {
 
   // Creates an activity and sets it as the one currently in use.
   void SetUserActivity(const std::string& type,
-                       const base::DictionaryValue& user_info);
+                       const base::DictionaryValue& user_info,
+                       mate::Arguments* args);
 
   // Returns the type name of the current user activity.
   std::string GetCurrentActivityType();
diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index 205110d54d30..4561eab8c950 100644
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -13,6 +13,8 @@
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "brightray/common/application_info.h"
+#include "net/base/mac/url_conversions.h"
+#include "url/gurl.h"
 
 namespace atom {
 
@@ -112,12 +114,16 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol) {
 void Browser::SetAppUserModelID(const base::string16& name) {
 }
 
-void Browser::SetUserActivity(
-    const std::string& type,
-    const base::DictionaryValue& user_info) {
+void Browser::SetUserActivity(const std::string& type,
+                              const base::DictionaryValue& user_info,
+                              mate::Arguments* args) {
+  std::string url_string;
+  args->GetNext(&url_string);
+
   [[AtomApplication sharedApplication]
       setCurrentActivity:base::SysUTF8ToNSString(type)
-            withUserInfo:DictionaryValueToNSDictionary(user_info)];
+            withUserInfo:DictionaryValueToNSDictionary(user_info)
+          withWebpageURL:net::NSURLWithGURL(GURL(url_string))];
 }
 
 std::string Browser::GetCurrentActivityType() {
@@ -126,9 +132,8 @@ std::string Browser::GetCurrentActivityType() {
   return base::SysNSStringToUTF8(userActivity.activityType);
 }
 
-bool Browser::ContinueUserActivity(
-    const std::string& type,
-    const base::DictionaryValue& user_info) {
+bool Browser::ContinueUserActivity(const std::string& type,
+                                   const base::DictionaryValue& user_info) {
   bool prevent_default = false;
   FOR_EACH_OBSERVER(BrowserObserver,
                     observers_,
diff --git a/atom/browser/mac/atom_application.h b/atom/browser/mac/atom_application.h
index e6489b75fb9f..73baf9e7d980 100644
--- a/atom/browser/mac/atom_application.h
+++ b/atom/browser/mac/atom_application.h
@@ -21,6 +21,8 @@
 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
 
 - (NSUserActivity*)getCurrentActivity;
-- (void)setCurrentActivity:(NSString*)type withUserInfo:(NSDictionary*)userInfo;
+- (void)setCurrentActivity:(NSString*)type
+              withUserInfo:(NSDictionary*)userInfo
+            withWebpageURL:(NSURL*)webpageURL;
 
 @end
diff --git a/atom/browser/mac/atom_application.mm b/atom/browser/mac/atom_application.mm
index fa91836f29e0..ea64af3a04d2 100644
--- a/atom/browser/mac/atom_application.mm
+++ b/atom/browser/mac/atom_application.mm
@@ -29,10 +29,12 @@
 }
 
 - (void)setCurrentActivity:(NSString*)type
-              withUserInfo:(NSDictionary*)userInfo {
+              withUserInfo:(NSDictionary*)userInfo
+            withWebpageURL:(NSURL*)webpageURL {
   currentActivity_ = base::scoped_nsobject<NSUserActivity>(
       [[NSUserActivity alloc] initWithActivityType:type]);
   [currentActivity_ setUserInfo:userInfo];
+  [currentActivity_ setWebpageURL:webpageURL];
   [currentActivity_ becomeCurrent];
 }
 
diff --git a/docs/api/app.md b/docs/api/app.md
index eddd4147db9d..ba0accf19825 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -496,11 +496,13 @@ app.on('ready', () => {
 });
 ```
 
-### `app.setUserActivity(type, userInfo)` _OS X_
+### `app.setUserActivity(type, userInfo[, webpageURL])` _OS X_
 
 * `type` String - Uniquely identifies the activity. Maps to
   [`NSUserActivity.activityType`][activity-type].
 * `userInfo` Object - App-specific state to store for use by another device.
+* `webpageURL` String - The webpage to load in a browser if no suitable app is
+  installed on the resuming device. The scheme must be `http` or `https`.
 
 Creates an `NSUserActivity` and sets it as the current activity. The activity
 is eligible for [Handoff][handoff] to another device afterward.

From b1226a908bb672063fe95d86274a62cb5a15c4bf Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 25 May 2016 10:55:02 +0900
Subject: [PATCH 382/510] Update node: remove ATOM_SHELL_INTERNAL_RUN_AS_NODE

---
 vendor/node | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/node b/vendor/node
index f23df7c224ae..d4528c219df8 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit f23df7c224ae5b67c1bc14a82a8020171308b47b
+Subproject commit d4528c219df8f442d769bae054883e1af79f105e

From 545c9f5bedb350042659842ae4f44d4a0a5d87de Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 25 May 2016 13:45:25 +0900
Subject: [PATCH 383/510] Ignore invalid parameter error in Electron

---
 atom/app/atom_main_delegate.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
index ff7ba0894f35..9ce8dc504a92 100644
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -30,6 +30,13 @@ bool IsBrowserProcess(base::CommandLine* cmd) {
   return process_type.empty();
 }
 
+#if defined(OS_WIN)
+void InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*,
+                             unsigned int, uintptr_t) {
+  // noop.
+}
+#endif
+
 }  // namespace
 
 AtomMainDelegate::AtomMainDelegate() {
@@ -87,6 +94,11 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
   SetUpBundleOverrides();
 #endif
 
+#if defined(OS_WIN)
+  // Ignore invalid parameter errors.
+  _set_invalid_parameter_handler(InvalidParameterHandler);
+#endif
+
   return brightray::MainDelegate::BasicStartupComplete(exit_code);
 }
 

From 34c4e797bbba3bbeb718340c9ca40eca1536d10b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 25 May 2016 14:40:14 +0900
Subject: [PATCH 384/510] Truncate the strings passed to
 google_breakpad::CustomInfoEntry

---
 .../crash_reporter/crash_reporter_win.cc      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/atom/common/crash_reporter/crash_reporter_win.cc b/atom/common/crash_reporter/crash_reporter_win.cc
index 939a02f090c5..4264f6af9db4 100644
--- a/atom/common/crash_reporter/crash_reporter_win.cc
+++ b/atom/common/crash_reporter/crash_reporter_win.cc
@@ -43,6 +43,10 @@ const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
 const wchar_t kWaitEventFormat[] = L"$1CrashServiceWaitEvent";
 const wchar_t kPipeNameFormat[] = L"\\\\.\\pipe\\$1 Crash Service";
 
+// Matches breakpad/src/client/windows/common/ipc_protocol.h.
+const int kNameMaxLength = 64;
+const int kValueMaxLength = 64;
+
 typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
                                                  NTSTATUS ExitStatus);
 char* g_real_terminate_process_stub = NULL;
@@ -247,9 +251,18 @@ google_breakpad::CustomClientInfo* CrashReporterWin::GetCustomInfo(
 
   for (StringMap::const_iterator iter = upload_parameters_.begin();
        iter != upload_parameters_.end(); ++iter) {
-    custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
-        base::UTF8ToWide(iter->first).c_str(),
-        base::UTF8ToWide(iter->second).c_str()));
+    // breakpad has hardcoded the length of name/value, and doesn't truncate
+    // the values itself, so we have to truncate them here otherwise weird
+    // things may happen.
+    std::wstring name = base::UTF8ToWide(iter->first);
+    std::wstring value = base::UTF8ToWide(iter->second);
+    if (name.length() > kNameMaxLength - 1)
+      name.resize(kNameMaxLength - 1);
+    if (value.length() > kValueMaxLength - 1)
+      value.resize(kValueMaxLength - 1);
+
+    custom_info_entries_.push_back(
+        google_breakpad::CustomInfoEntry(name.c_str(), value.c_str()));
   }
 
   custom_info_.entries = &custom_info_entries_.front();

From c2633460ebcfbb94196dfa6cca33ba9d46504b92 Mon Sep 17 00:00:00 2001
From: Vadim Macagon <vadim.macagon@gmail.com>
Date: Wed, 25 May 2016 12:46:17 +0700
Subject: [PATCH 385/510] Improve documentation of `ses.cookies.set()`

Fix description of the `details.url` param in `ses.cookies.set()`, and clarify the fact that cookies without an expiration date will not be retained between sessions.
---
 docs/api/session.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/api/session.md b/docs/api/session.md
index 2d950ddd474a..43107e98e920 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -137,20 +137,21 @@ with `callback(error, cookies)` on complete.
 #### `ses.cookies.set(details, callback)`
 
 * `details` Object
-  * `url` String - Retrieves cookies which are associated with `url`
+  * `url` String - The url to associate the cookie with.
   * `name` String - The name of the cookie. Empty by default if omitted.
   * `value` String - The value of the cookie. Empty by default if omitted.
   * `domain` String - The domain of the cookie. Empty by default if omitted.
   * `path` String - The path of the cookie. Empty by default if omitted.
   * `secure` Boolean - Whether the cookie should be marked as Secure. Defaults to
     false.
-  * `session` Boolean - Whether the cookie should be marked as HttpOnly. Defaults
+  * `session` Boolean - Whether the cookie should be marked as HTTP only. Defaults
     to false.
   * `expirationDate` Double -	The expiration date of the cookie as the number of
-    seconds since the UNIX epoch. If omitted, the cookie becomes a session cookie.
+    seconds since the UNIX epoch. If omitted then the cookie becomes a session
+    cookie and will not be retained between sessions.
 * `callback` Function
 
-Sets the cookie with `details`, `callback` will be called with `callback(error)`
+Sets a cookie with `details`, `callback` will be called with `callback(error)`
 on complete.
 
 #### `ses.cookies.remove(url, name, callback)`

From 3dd2f709e0fc2a6f7066378eb4f693841e002cf5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 10:19:51 -0700
Subject: [PATCH 386/510] Remove mention of Atom Shell

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 5e891e5dd640..e221889dec10 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,6 @@
 [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron#info=devDependencies)
 [![Join the Electron Community on Slack](http://atom-slack.herokuapp.com/badge.svg)](http://atom-slack.herokuapp.com/)
 
-:zap: *Formerly known as Atom Shell* :zap:
-
 The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [Node.js](https://nodejs.org/) and
 [Chromium](http://www.chromium.org) and is used in the [Atom

From 8f1943bc7b7cfdcfeedfd4330c0deba95f44ebc9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 10:20:52 -0700
Subject: [PATCH 387/510] Link to other apps

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e221889dec10..b1e0d6b1b9a9 100644
--- a/README.md
+++ b/README.md
@@ -7,15 +7,15 @@
 
 The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [Node.js](https://nodejs.org/) and
-[Chromium](http://www.chromium.org) and is used in the [Atom
-editor](https://github.com/atom/atom).
+[Chromium](http://www.chromium.org) and is used by the [Atom
+editor](https://github.com/atom/atom) and many other [apps](http://electron.atom.io/apps).
 
 Follow [@ElectronJS](https://twitter.com/electronjs) on Twitter for important
 announcements.
 
 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
 By participating, you are expected to uphold this code. Please report unacceptable
-behavior to atom@github.com.
+behavior to electron@github.com.
 
 ## Downloads
 

From 7e209dd9824915a1df0735a4f0934262127cf81d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 10:22:13 -0700
Subject: [PATCH 388/510] ATOM_SHELL_INTERNAL_CRASH_SERVICE ->
 ELECTRON_INTERNAL_CRASH_SERVICE

---
 atom/app/atom_main.cc            | 2 +-
 lib/common/api/crash-reporter.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
index be060ab4329a..03055e04daf5 100644
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -105,7 +105,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
     base::AtExitManager atexit_manager;
     base::i18n::InitializeICU();
     return atom::NodeMain(argc, argv);
-  } else if (IsEnvSet("ATOM_SHELL_INTERNAL_CRASH_SERVICE")) {
+  } else if (IsEnvSet("ELECTRON_INTERNAL_CRASH_SERVICE")) {
     return crash_service::Main(cmd);
   }
 
diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js
index 21e352e7e510..13d7a07ad9cf 100644
--- a/lib/common/api/crash-reporter.js
+++ b/lib/common/api/crash-reporter.js
@@ -55,7 +55,7 @@ var CrashReporter = (function () {
     if (process.platform === 'win32') {
       args = ['--reporter-url=' + submitURL, '--application-name=' + this.productName, '--v=1']
       env = {
-        ATOM_SHELL_INTERNAL_CRASH_SERVICE: 1
+        ELECTRON_INTERNAL_CRASH_SERVICE: 1
       }
       spawn(process.execPath, args, {
         env: env,

From 94c8b0e1b1657e042339b2f4ded4388330af5327 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 10:27:46 -0700
Subject: [PATCH 389/510] atom_shell -> electron

---
 script/bootstrap.py         |  4 +--
 script/bump-version.py      |  4 +--
 script/create-dist.py       | 16 ++++-----
 script/lib/config.py        | 12 +++----
 script/lib/util.py          |  2 +-
 script/test.py              |  8 ++---
 script/upload-index-json.py |  8 ++---
 script/upload.py            | 66 ++++++++++++++++++-------------------
 8 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/script/bootstrap.py b/script/bootstrap.py
index 4370c7534da2..6380ffe27c7a 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -7,7 +7,7 @@ import sys
 
 from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
                        enable_verbose_mode, is_verbose_mode, get_target_arch
-from lib.util import execute_stdout, get_atom_shell_version, scoped_cwd
+from lib.util import execute_stdout, get_electron_version, scoped_cwd
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -184,7 +184,7 @@ def update_node_modules(dirname, env=None):
 def update_electron_modules(dirname, target_arch):
   env = os.environ.copy()
   env['npm_config_arch']    = target_arch
-  env['npm_config_target']  = get_atom_shell_version()
+  env['npm_config_target']  = get_electron_version()
   env['npm_config_disturl'] = 'https://atom.io/download/atom-shell'
   update_node_modules(dirname, env)
 
diff --git a/script/bump-version.py b/script/bump-version.py
index 5c70d4494e8d..db7c9d4e3a36 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -4,7 +4,7 @@ import os
 import re
 import sys
 
-from lib.util import execute, get_atom_shell_version, parse_version, scoped_cwd
+from lib.util import execute, get_electron_version, parse_version, scoped_cwd
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -18,7 +18,7 @@ def main():
   option = sys.argv[1]
   increments = ['major', 'minor', 'patch', 'build']
   if option in increments:
-    version = get_atom_shell_version()
+    version = get_electron_version()
     versions = parse_version(version.split('-')[0])
     versions = increase_version(versions, increments.index(option))
   else:
diff --git a/script/create-dist.py b/script/create-dist.py
index 6602cbf2c143..c639ab8e1637 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -11,11 +11,11 @@ import stat
 from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
                        get_target_arch, get_chromedriver_version, \
                        get_platform_key
-from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \
+from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
                      execute, atom_gyp
 
 
-ATOM_SHELL_VERSION = get_atom_shell_version()
+ELECTRON_VERSION = get_electron_version()
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
@@ -86,7 +86,7 @@ def main():
   create_version()
   create_dist_zip()
   create_chrome_binary_zip('chromedriver', get_chromedriver_version())
-  create_chrome_binary_zip('mksnapshot', ATOM_SHELL_VERSION)
+  create_chrome_binary_zip('mksnapshot', ELECTRON_VERSION)
   create_ffmpeg_zip()
   create_symbols_zip()
 
@@ -140,7 +140,7 @@ def strip_binary(binary_path):
 def create_version():
   version_path = os.path.join(SOURCE_ROOT, 'dist', 'version')
   with open(version_path, 'w') as version_file:
-    version_file.write(ATOM_SHELL_VERSION)
+    version_file.write(ELECTRON_VERSION)
 
 
 def create_symbols():
@@ -155,7 +155,7 @@ def create_symbols():
 
 
 def create_dist_zip():
-  dist_name = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME, ATOM_SHELL_VERSION,
+  dist_name = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME, ELECTRON_VERSION,
                                            get_platform_key(),
                                            get_target_arch())
   zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
@@ -183,7 +183,7 @@ def create_chrome_binary_zip(binary, version):
 
 def create_ffmpeg_zip():
   dist_name = 'ffmpeg-{0}-{1}-{2}.zip'.format(
-      ATOM_SHELL_VERSION, get_platform_key(), get_target_arch())
+      ELECTRON_VERSION, get_platform_key(), get_target_arch())
   zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
 
   if PLATFORM == 'darwin':
@@ -205,7 +205,7 @@ def create_ffmpeg_zip():
 
 def create_symbols_zip():
   dist_name = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME,
-                                                   ATOM_SHELL_VERSION,
+                                                   ELECTRON_VERSION,
                                                    get_platform_key(),
                                                    get_target_arch())
   zip_file = os.path.join(DIST_DIR, dist_name)
@@ -217,7 +217,7 @@ def create_symbols_zip():
 
   if PLATFORM == 'darwin':
     dsym_name = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME,
-                                                  ATOM_SHELL_VERSION,
+                                                  ELECTRON_VERSION,
                                                   get_platform_key(),
                                                   get_target_arch())
     with scoped_cwd(DIST_DIR):
diff --git a/script/lib/config.py b/script/lib/config.py
index 8ea5bf1e6059..485ed48f80d0 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -46,12 +46,12 @@ def get_chromedriver_version():
 
 
 def s3_config():
-  config = (os.environ.get('ATOM_SHELL_S3_BUCKET', ''),
-            os.environ.get('ATOM_SHELL_S3_ACCESS_KEY', ''),
-            os.environ.get('ATOM_SHELL_S3_SECRET_KEY', ''))
-  message = ('Error: Please set the $ATOM_SHELL_S3_BUCKET, '
-             '$ATOM_SHELL_S3_ACCESS_KEY, and '
-             '$ATOM_SHELL_S3_SECRET_KEY environment variables')
+  config = (os.environ.get('ELECTRON_S3_BUCKET', ''),
+            os.environ.get('ELECTRON_S3_ACCESS_KEY', ''),
+            os.environ.get('ELECTRON_S3_SECRET_KEY', ''))
+  message = ('Error: Please set the $ELECTRON_S3_BUCKET, '
+             '$ELECTRON_S3_ACCESS_KEY, and '
+             '$ELECTRON_S3_SECRET_KEY environment variables')
   assert all(len(c) for c in config), message
   return config
 
diff --git a/script/lib/util.py b/script/lib/util.py
index 718962769dd8..fe09a4d9646c 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -187,7 +187,7 @@ def atom_gyp():
     return obj['variables']
 
 
-def get_atom_shell_version():
+def get_electron_version():
   return 'v' + atom_gyp()['version%']
 
 
diff --git a/script/test.py b/script/test.py
index 5adfd4eed6c5..c86aad460a5d 100755
--- a/script/test.py
+++ b/script/test.py
@@ -21,18 +21,18 @@ def main():
     config = 'R'
 
   if sys.platform == 'darwin':
-    atom_shell = os.path.join(SOURCE_ROOT, 'out', config,
+    electron = os.path.join(SOURCE_ROOT, 'out', config,
                               '{0}.app'.format(PRODUCT_NAME), 'Contents',
                               'MacOS', PRODUCT_NAME)
   elif sys.platform == 'win32':
-    atom_shell = os.path.join(SOURCE_ROOT, 'out', config,
+    electron = os.path.join(SOURCE_ROOT, 'out', config,
                               '{0}.exe'.format(PROJECT_NAME))
   else:
-    atom_shell = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME)
+    electron = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME)
 
   returncode = 0
   try:
-    subprocess.check_call([atom_shell, 'spec'] + sys.argv[1:])
+    subprocess.check_call([electron, 'spec'] + sys.argv[1:])
   except subprocess.CalledProcessError as e:
     returncode = e.returncode
 
diff --git a/script/upload-index-json.py b/script/upload-index-json.py
index 671408fa9219..d926b105a6d7 100755
--- a/script/upload-index-json.py
+++ b/script/upload-index-json.py
@@ -18,14 +18,14 @@ def main():
   # Upload the index.json.
   with scoped_cwd(SOURCE_ROOT):
     if sys.platform == 'darwin':
-      atom_shell = os.path.join(OUT_DIR, '{0}.app'.format(PRODUCT_NAME),
+      electron = os.path.join(OUT_DIR, '{0}.app'.format(PRODUCT_NAME),
                                 'Contents', 'MacOS', PRODUCT_NAME)
     elif sys.platform == 'win32':
-      atom_shell = os.path.join(OUT_DIR, '{0}.exe'.format(PROJECT_NAME))
+      electron = os.path.join(OUT_DIR, '{0}.exe'.format(PROJECT_NAME))
     else:
-      atom_shell = os.path.join(OUT_DIR, PROJECT_NAME)
+      electron = os.path.join(OUT_DIR, PROJECT_NAME)
     index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
-    execute([atom_shell,
+    execute([electron,
              os.path.join('tools', 'dump-version-info.js'),
              index_json])
 
diff --git a/script/upload.py b/script/upload.py
index 80d9e5e9e090..3db0a3e5bade 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -9,13 +9,13 @@ import tempfile
 
 from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
                        get_platform_key
-from lib.util import atom_gyp, execute, get_atom_shell_version, parse_version, \
+from lib.util import atom_gyp, execute, get_electron_version, parse_version, \
                      scoped_cwd
 from lib.github import GitHub
 
 
-ATOM_SHELL_REPO = 'electron/electron'
-ATOM_SHELL_VERSION = get_atom_shell_version()
+ELECTRON_REPO = 'electron/electron'
+ELECTRON_VERSION = get_electron_version()
 
 PROJECT_NAME = atom_gyp()['project_name%']
 PRODUCT_NAME = atom_gyp()['product_name%']
@@ -24,15 +24,15 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
 DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
 DIST_NAME = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME,
-                                         ATOM_SHELL_VERSION,
+                                         ELECTRON_VERSION,
                                          get_platform_key(),
                                          get_target_arch())
 SYMBOLS_NAME = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME,
-                                                    ATOM_SHELL_VERSION,
+                                                    ELECTRON_VERSION,
                                                     get_platform_key(),
                                                     get_target_arch())
 DSYM_NAME = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME,
-                                              ATOM_SHELL_VERSION,
+                                              ELECTRON_VERSION,
                                               get_platform_key(),
                                               get_target_arch())
 
@@ -45,16 +45,16 @@ def main():
       create_dist = os.path.join(SOURCE_ROOT, 'script', 'create-dist.py')
       execute([sys.executable, create_dist])
 
-    build_version = get_atom_shell_build_version()
-    if not ATOM_SHELL_VERSION.startswith(build_version):
+    build_version = get_electron_build_version()
+    if not ELECTRON_VERSION.startswith(build_version):
       error = 'Tag name ({0}) should match build version ({1})\n'.format(
-          ATOM_SHELL_VERSION, build_version)
+          ELECTRON_VERSION, build_version)
       sys.stderr.write(error)
       sys.stderr.flush()
       return 1
 
   github = GitHub(auth_token())
-  releases = github.repos(ATOM_SHELL_REPO).releases.get()
+  releases = github.repos(ELECTRON_REPO).releases.get()
   tag_exists = False
   for release in releases:
     if not release['draft'] and release['tag_name'] == args.version:
@@ -68,7 +68,7 @@ def main():
     # Upload the SHASUMS.txt.
     execute([sys.executable,
              os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'),
-             '-v', ATOM_SHELL_VERSION])
+             '-v', ELECTRON_VERSION])
 
     # Upload the index.json.
     execute([sys.executable,
@@ -81,24 +81,24 @@ def main():
     return
 
   # Upload atom-shell with GitHub Releases API.
-  upload_atom_shell(github, release, os.path.join(DIST_DIR, DIST_NAME))
-  upload_atom_shell(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
+  upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME))
+  upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
   if PLATFORM == 'darwin':
-    upload_atom_shell(github, release, os.path.join(DIST_DIR, DSYM_NAME))
+    upload_electron(github, release, os.path.join(DIST_DIR, DSYM_NAME))
 
   # Upload free version of ffmpeg.
   ffmpeg = 'ffmpeg-{0}-{1}-{2}.zip'.format(
-      ATOM_SHELL_VERSION, get_platform_key(), get_target_arch())
-  upload_atom_shell(github, release, os.path.join(DIST_DIR, ffmpeg))
+      ELECTRON_VERSION, get_platform_key(), get_target_arch())
+  upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg))
 
   # Upload chromedriver and mksnapshot for minor version update.
   if parse_version(args.version)[2] == '0':
     chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format(
         get_chromedriver_version(), get_platform_key(), get_target_arch())
-    upload_atom_shell(github, release, os.path.join(DIST_DIR, chromedriver))
+    upload_electron(github, release, os.path.join(DIST_DIR, chromedriver))
     mksnapshot = 'mksnapshot-{0}-{1}-{2}.zip'.format(
-        ATOM_SHELL_VERSION, get_platform_key(), get_target_arch())
-    upload_atom_shell(github, release, os.path.join(DIST_DIR, mksnapshot))
+        ELECTRON_VERSION, get_platform_key(), get_target_arch())
+    upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot))
 
   if PLATFORM == 'win32' and not tag_exists:
     # Upload PDBs to Windows symbol server.
@@ -114,28 +114,28 @@ def main():
 def parse_args():
   parser = argparse.ArgumentParser(description='upload distribution file')
   parser.add_argument('-v', '--version', help='Specify the version',
-                      default=ATOM_SHELL_VERSION)
+                      default=ELECTRON_VERSION)
   parser.add_argument('-p', '--publish-release',
                       help='Publish the release',
                       action='store_true')
   return parser.parse_args()
 
 
-def get_atom_shell_build_version():
+def get_electron_build_version():
   if get_target_arch() == 'arm' or os.environ.has_key('CI'):
     # In CI we just build as told.
-    return ATOM_SHELL_VERSION
+    return ELECTRON_VERSION
   if PLATFORM == 'darwin':
-    atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R',
+    electron = os.path.join(SOURCE_ROOT, 'out', 'R',
                               '{0}.app'.format(PRODUCT_NAME), 'Contents',
                               'MacOS', PRODUCT_NAME)
   elif PLATFORM == 'win32':
-    atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R',
+    electron = os.path.join(SOURCE_ROOT, 'out', 'R',
                               '{0}.exe'.format(PROJECT_NAME))
   else:
-    atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R', PROJECT_NAME)
+    electron = os.path.join(SOURCE_ROOT, 'out', 'R', PROJECT_NAME)
 
-  return subprocess.check_output([atom_shell, '--version']).strip()
+  return subprocess.check_output([electron, '--version']).strip()
 
 
 def dist_newer_than_head():
@@ -192,17 +192,17 @@ def create_release_draft(github, tag):
     sys.exit(0)
 
   data = dict(tag_name=tag, name=name, body=body, draft=True)
-  r = github.repos(ATOM_SHELL_REPO).releases.post(data=data)
+  r = github.repos(ELECTRON_REPO).releases.post(data=data)
   return r
 
 
-def upload_atom_shell(github, release, file_path):
+def upload_electron(github, release, file_path):
   # Delete the original file before uploading in CI.
   if os.environ.has_key('CI'):
     try:
       for asset in release['assets']:
         if asset['name'] == os.path.basename(file_path):
-          github.repos(ATOM_SHELL_REPO).releases.assets(asset['id']).delete()
+          github.repos(ELECTRON_REPO).releases.assets(asset['id']).delete()
           break
     except Exception:
       pass
@@ -211,18 +211,18 @@ def upload_atom_shell(github, release, file_path):
   params = {'name': os.path.basename(file_path)}
   headers = {'Content-Type': 'application/zip'}
   with open(file_path, 'rb') as f:
-    github.repos(ATOM_SHELL_REPO).releases(release['id']).assets.post(
+    github.repos(ELECTRON_REPO).releases(release['id']).assets.post(
         params=params, headers=headers, data=f, verify=False)
 
 
 def publish_release(github, release_id):
   data = dict(draft=False)
-  github.repos(ATOM_SHELL_REPO).releases(release_id).patch(data=data)
+  github.repos(ELECTRON_REPO).releases(release_id).patch(data=data)
 
 
 def auth_token():
-  token = os.environ.get('ATOM_SHELL_GITHUB_TOKEN')
-  message = ('Error: Please set the $ATOM_SHELL_GITHUB_TOKEN '
+  token = os.environ.get('ELECTRON_GITHUB_TOKEN')
+  message = ('Error: Please set the $ELECTRON_GITHUB_TOKEN '
              'environment variable, which is your personal token')
   assert token, message
   return token

From 1bdb9f3de07eff6c0c6d05b83f8b82e0021cfdd1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 17:16:04 -0700
Subject: [PATCH 390/510] Add fallback s3 config values

---
 script/lib/config.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index 485ed48f80d0..a48c5ac5cdba 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -46,9 +46,10 @@ def get_chromedriver_version():
 
 
 def s3_config():
-  config = (os.environ.get('ELECTRON_S3_BUCKET', ''),
-            os.environ.get('ELECTRON_S3_ACCESS_KEY', ''),
-            os.environ.get('ELECTRON_S3_SECRET_KEY', ''))
+  # TODO Remove ATOM_SHELL_* fallback values
+  config = (os.environ.get('ELECTRON_S3_BUCKET', os.environ.get('ATOM_SHELL_S3_BUCKET', '')),
+            os.environ.get('ELECTRON_S3_ACCESS_KEY',  os.environ.get('ATOM_SHELL_S3_ACCESS_KEY', '')),
+            os.environ.get('ELECTRON_S3_SECRET_KEY', os.environ.get('ATOM_SHELL_S3_SECRET_KEY', '')))
   message = ('Error: Please set the $ELECTRON_S3_BUCKET, '
              '$ELECTRON_S3_ACCESS_KEY, and '
              '$ELECTRON_S3_SECRET_KEY environment variables')

From 43f0dfd0ab004465f223c43d7ce1a807f0e9e9a4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 17:33:44 -0700
Subject: [PATCH 391/510] Deprecate old S3 env vars

---
 script/lib/config.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index a48c5ac5cdba..26d91622035f 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -44,12 +44,20 @@ def get_target_arch():
 def get_chromedriver_version():
   return 'v2.21'
 
+def get_env_var(name):
+  value = os.environ.get('ELECTRON_' + name, '')
+  if not value:
+    # TODO Remove ATOM_SHELL_* fallback values
+    value = os.environ.get('ATOM_SHELL_' + name, '')
+    if value:
+      print 'Warning: Use $ELECTRON_' + name + ' instead of $ATOM_SHELL_' + name
+  return value
+
 
 def s3_config():
-  # TODO Remove ATOM_SHELL_* fallback values
-  config = (os.environ.get('ELECTRON_S3_BUCKET', os.environ.get('ATOM_SHELL_S3_BUCKET', '')),
-            os.environ.get('ELECTRON_S3_ACCESS_KEY',  os.environ.get('ATOM_SHELL_S3_ACCESS_KEY', '')),
-            os.environ.get('ELECTRON_S3_SECRET_KEY', os.environ.get('ATOM_SHELL_S3_SECRET_KEY', '')))
+  config = (get_env_var('S3_BUCKET'),
+            get_env_var('S3_ACCESS_KEY'),
+            get_env_var('S3_SECRET_KEY'))
   message = ('Error: Please set the $ELECTRON_S3_BUCKET, '
              '$ELECTRON_S3_ACCESS_KEY, and '
              '$ELECTRON_S3_SECRET_KEY environment variables')

From 6c8cf16508b559b74decbd9840a17b2a95fa23a5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 17:35:30 -0700
Subject: [PATCH 392/510] Deprecate ATOM_SHELL_GITHUB_TOKEN

---
 script/upload.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/upload.py b/script/upload.py
index 3db0a3e5bade..7dc6749942da 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -8,7 +8,7 @@ import sys
 import tempfile
 
 from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
-                       get_platform_key
+                       get_platform_key, get_env_var
 from lib.util import atom_gyp, execute, get_electron_version, parse_version, \
                      scoped_cwd
 from lib.github import GitHub
@@ -221,7 +221,7 @@ def publish_release(github, release_id):
 
 
 def auth_token():
-  token = os.environ.get('ELECTRON_GITHUB_TOKEN')
+  token = get_env_var('GITHUB_TOKEN')
   message = ('Error: Please set the $ELECTRON_GITHUB_TOKEN '
              'environment variable, which is your personal token')
   assert token, message

From 9684f61e12e8c0651359ec040addfe6b72885f5d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 09:10:46 -0700
Subject: [PATCH 393/510] atom_gyp -> electron_gyp

---
 script/build.py              | 4 ++--
 script/bump-version.py       | 4 ++--
 script/create-dist.py        | 6 +++---
 script/dump-symbols.py       | 4 ++--
 script/lib/util.py           | 4 ++--
 script/start.py              | 6 +++---
 script/test.py               | 6 +++---
 script/upload-index-json.py  | 6 +++---
 script/upload-windows-pdb.py | 6 +++---
 script/upload.py             | 8 ++++----
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/script/build.py b/script/build.py
index a134c014254f..1a7378bf9758 100755
--- a/script/build.py
+++ b/script/build.py
@@ -6,7 +6,7 @@ import subprocess
 import sys
 
 from lib.config import get_target_arch
-from lib.util import atom_gyp, import_vs_env
+from lib.util import electron_gyp, import_vs_env
 
 
 CONFIGURATIONS = ['Release', 'Debug']
@@ -40,7 +40,7 @@ def parse_args():
                       required=False)
   parser.add_argument('-t', '--target',
                       help='Build specified target',
-                      default=atom_gyp()['project_name%'],
+                      default=electron_gyp()['project_name%'],
                       required=False)
   return parser.parse_args()
 
diff --git a/script/bump-version.py b/script/bump-version.py
index db7c9d4e3a36..4db30b71fca9 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -27,7 +27,7 @@ def main():
   version = '.'.join(versions[:3])
 
   with scoped_cwd(SOURCE_ROOT):
-    update_atom_gyp(version)
+    update_electron_gyp(version)
     update_win_rc(version, versions)
     update_version_h(versions)
     update_info_plist(version)
@@ -42,7 +42,7 @@ def increase_version(versions, index):
   return versions
 
 
-def update_atom_gyp(version):
+def update_electron_gyp(version):
   pattern = re.compile(" *'version%' *: *'[0-9.]+'")
   with open('electron.gyp', 'r') as f:
     lines = f.readlines()
diff --git a/script/create-dist.py b/script/create-dist.py
index c639ab8e1637..3f95cf2281d6 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -12,7 +12,7 @@ from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
                        get_target_arch, get_chromedriver_version, \
                        get_platform_key
 from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
-                     execute, atom_gyp
+                     execute, electron_gyp
 
 
 ELECTRON_VERSION = get_electron_version()
@@ -23,8 +23,8 @@ OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
 CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
                             'download', 'libchromiumcontent', 'static_library')
 
-PROJECT_NAME = atom_gyp()['project_name%']
-PRODUCT_NAME = atom_gyp()['product_name%']
+PROJECT_NAME = electron_gyp()['project_name%']
+PRODUCT_NAME = electron_gyp()['product_name%']
 
 TARGET_BINARIES = {
   'darwin': [
diff --git a/script/dump-symbols.py b/script/dump-symbols.py
index 5c98d38a31f8..76949e95aa92 100755
--- a/script/dump-symbols.py
+++ b/script/dump-symbols.py
@@ -4,7 +4,7 @@ import os
 import sys
 
 from lib.config import PLATFORM
-from lib.util import atom_gyp, execute, rm_rf
+from lib.util import electron_gyp, execute, rm_rf
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -56,7 +56,7 @@ def register_required_dll():
 
 
 def get_names_from_gyp():
-  variables = atom_gyp()
+  variables = electron_gyp()
   return (variables['project_name%'], variables['product_name%'])
 
 
diff --git a/script/lib/util.py b/script/lib/util.py
index fe09a4d9646c..4db4e5fa6748 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -179,7 +179,7 @@ def execute_stdout(argv, env=os.environ):
     execute(argv, env)
 
 
-def atom_gyp():
+def electron_gyp():
   SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
   gyp = os.path.join(SOURCE_ROOT, 'electron.gyp')
   with open(gyp) as f:
@@ -188,7 +188,7 @@ def atom_gyp():
 
 
 def get_electron_version():
-  return 'v' + atom_gyp()['version%']
+  return 'v' + electron_gyp()['version%']
 
 
 def parse_version(version):
diff --git a/script/start.py b/script/start.py
index 76a079cb26ea..839ddf997348 100644
--- a/script/start.py
+++ b/script/start.py
@@ -4,13 +4,13 @@ import os
 import subprocess
 import sys
 
-from lib.util import atom_gyp
+from lib.util import electron_gyp
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
-PROJECT_NAME = atom_gyp()['project_name%']
-PRODUCT_NAME = atom_gyp()['product_name%']
+PROJECT_NAME = electron_gyp()['project_name%']
+PRODUCT_NAME = electron_gyp()['product_name%']
 
 
 def main():
diff --git a/script/test.py b/script/test.py
index c86aad460a5d..02377f481c5b 100755
--- a/script/test.py
+++ b/script/test.py
@@ -4,13 +4,13 @@ import os
 import subprocess
 import sys
 
-from lib.util import atom_gyp, rm_rf
+from lib.util import electron_gyp, rm_rf
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
-PROJECT_NAME = atom_gyp()['project_name%']
-PRODUCT_NAME = atom_gyp()['product_name%']
+PROJECT_NAME = electron_gyp()['project_name%']
+PRODUCT_NAME = electron_gyp()['product_name%']
 
 
 def main():
diff --git a/script/upload-index-json.py b/script/upload-index-json.py
index d926b105a6d7..f5e5b3c7a6ad 100755
--- a/script/upload-index-json.py
+++ b/script/upload-index-json.py
@@ -4,14 +4,14 @@ import os
 import sys
 
 from lib.config import PLATFORM, s3_config
-from lib.util import atom_gyp, execute, s3put, scoped_cwd
+from lib.util import electron_gyp, execute, s3put, scoped_cwd
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 OUT_DIR     = os.path.join(SOURCE_ROOT, 'out', 'D')
 
-PROJECT_NAME = atom_gyp()['project_name%']
-PRODUCT_NAME = atom_gyp()['product_name%']
+PROJECT_NAME = electron_gyp()['project_name%']
+PRODUCT_NAME = electron_gyp()['product_name%']
 
 
 def main():
diff --git a/script/upload-windows-pdb.py b/script/upload-windows-pdb.py
index 12186aad2edc..6e8030337f3c 100755
--- a/script/upload-windows-pdb.py
+++ b/script/upload-windows-pdb.py
@@ -5,15 +5,15 @@ import glob
 import sys
 
 from lib.config import s3_config
-from lib.util import atom_gyp, execute, rm_rf, safe_mkdir, s3put
+from lib.util import electron_gyp, execute, rm_rf, safe_mkdir, s3put
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 SYMBOLS_DIR = 'dist\\symbols'
 DOWNLOAD_DIR = 'vendor\\brightray\\vendor\\download\\libchromiumcontent'
 
-PROJECT_NAME = atom_gyp()['project_name%']
-PRODUCT_NAME = atom_gyp()['product_name%']
+PROJECT_NAME = electron_gyp()['project_name%']
+PRODUCT_NAME = electron_gyp()['product_name%']
 
 PDB_LIST = [
   'out\\R\\{0}.exe.pdb'.format(PROJECT_NAME),
diff --git a/script/upload.py b/script/upload.py
index 7dc6749942da..a7ac8f4472ac 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -9,7 +9,7 @@ import tempfile
 
 from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
                        get_platform_key, get_env_var
-from lib.util import atom_gyp, execute, get_electron_version, parse_version, \
+from lib.util import electron_gyp, execute, get_electron_version, parse_version, \
                      scoped_cwd
 from lib.github import GitHub
 
@@ -17,8 +17,8 @@ from lib.github import GitHub
 ELECTRON_REPO = 'electron/electron'
 ELECTRON_VERSION = get_electron_version()
 
-PROJECT_NAME = atom_gyp()['project_name%']
-PRODUCT_NAME = atom_gyp()['product_name%']
+PROJECT_NAME = electron_gyp()['project_name%']
+PRODUCT_NAME = electron_gyp()['product_name%']
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
@@ -80,7 +80,7 @@ def main():
     # Do not upload other files when passed "-p".
     return
 
-  # Upload atom-shell with GitHub Releases API.
+  # Upload Electron with GitHub Releases API.
   upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME))
   upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
   if PLATFORM == 'darwin':

From 32073fa079c26400cb805a12e8f1b6feb54d0c32 Mon Sep 17 00:00:00 2001
From: cdaringe <christopher.dieringer@gmail.com>
Date: Tue, 24 May 2016 23:38:35 -0600
Subject: [PATCH 394/510] :art: Support non-native promises

---
 filenames.gypi                     |  1 +
 lib/browser/rpc-server.js          |  4 ++--
 lib/common/api/exports/electron.js |  5 +++++
 lib/common/api/is-promise.js       | 14 ++++++++++++++
 lib/renderer/api/remote.js         |  4 ++--
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 lib/common/api/is-promise.js

diff --git a/filenames.gypi b/filenames.gypi
index cc33d9a81a67..14d01270f089 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -42,6 +42,7 @@
       'lib/common/api/crash-reporter.js',
       'lib/common/api/deprecate.js',
       'lib/common/api/deprecations.js',
+      'lib/common/api/is-promise.js',
       'lib/common/api/exports/electron.js',
       'lib/common/api/native-image.js',
       'lib/common/api/shell.js',
diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index 7ad6d2c22aef..fe264cceeeff 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -2,7 +2,7 @@
 
 const electron = require('electron')
 const v8Util = process.atomBinding('v8_util')
-const {ipcMain} = electron
+const {ipcMain, isPromise} = electron
 
 const objectsRegistry = require('./objects-registry')
 
@@ -65,7 +65,7 @@ let valueToMeta = function (sender, value, optimizeSimpleObject = false) {
       meta.type = 'error'
     } else if (value instanceof Date) {
       meta.type = 'date'
-    } else if (value.constructor != null && value.constructor.name === 'Promise') {
+    } else if (isPromise(value)) {
       meta.type = 'promise'
     } else if (value.hasOwnProperty('callee') && value.length != null) {
       // Treat the arguments object as array.
diff --git a/lib/common/api/exports/electron.js b/lib/common/api/exports/electron.js
index 1e9c2d71f3b7..efa44d452cc6 100644
--- a/lib/common/api/exports/electron.js
+++ b/lib/common/api/exports/electron.js
@@ -43,6 +43,11 @@ exports.defineProperties = function (exports) {
       get: function () {
         return require('../deprecations')
       }
+    },
+    isPromise: {
+      get: function () {
+        return require('../is-promise')
+      }
     }
   })
 }
diff --git a/lib/common/api/is-promise.js b/lib/common/api/is-promise.js
new file mode 100644
index 000000000000..d6115a145585
--- /dev/null
+++ b/lib/common/api/is-promise.js
@@ -0,0 +1,14 @@
+'use strict'
+
+module.exports = function isPromise (val) {
+  return (
+    val &&
+    val.then &&
+    val.then instanceof Function &&
+    val.constructor &&
+    val.constructor.reject &&
+    val.constructor.reject instanceof Function &&
+    val.constructor.resolve &&
+    val.constructor.resolve instanceof Function
+  )
+}
diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index d3fdec25aeb7..b5c9fe3a0e49 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const v8Util = process.atomBinding('v8_util')
-const {ipcRenderer, CallbacksRegistry} = require('electron')
+const {ipcRenderer, isPromise, CallbacksRegistry} = require('electron')
 
 const callbacksRegistry = new CallbacksRegistry()
 
@@ -44,7 +44,7 @@ var wrapArgs = function (args, visited) {
         value: value.getTime()
       }
     } else if ((value != null) && typeof value === 'object') {
-      if (value.constructor != null && value.constructor.name === 'Promise') {
+      if (isPromise(value)) {
         return {
           type: 'promise',
           then: valueToMeta(function (onFulfilled, onRejected) {

From 1e15ce6ccdd236eb4d7c75fae75b9c8381b3cc1f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 12:37:26 -0700
Subject: [PATCH 395/510] Add failing spec for webview visiblity changes

---
 spec/fixtures/pages/visibilitychange.html     | 11 ++++++++++
 .../pages/webview-visibilitychange.html       |  8 +++++++
 spec/webview-spec.js                          | 21 +++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 spec/fixtures/pages/visibilitychange.html
 create mode 100644 spec/fixtures/pages/webview-visibilitychange.html

diff --git a/spec/fixtures/pages/visibilitychange.html b/spec/fixtures/pages/visibilitychange.html
new file mode 100644
index 000000000000..9f49f520de1f
--- /dev/null
+++ b/spec/fixtures/pages/visibilitychange.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<script type="text/javascript" charset="utf-8">
+  const {ipcRenderer} = require('electron')
+  ipcRenderer.send('pong', document.visibilityState, document.hidden)
+  document.addEventListener('visibilitychange', function () {
+    ipcRenderer.send('pong', document.visibilityState, document.hidden)
+  })
+</script>
+</body>
+</html>
diff --git a/spec/fixtures/pages/webview-visibilitychange.html b/spec/fixtures/pages/webview-visibilitychange.html
new file mode 100644
index 000000000000..b0f05056382e
--- /dev/null
+++ b/spec/fixtures/pages/webview-visibilitychange.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<script>
+  console.log(document.visibilityState, document.hidden)
+</script>
+<webview nodeintegration src="visibilitychange.html"/>
+</body>
+</html>
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 8a109b6d7bfd..754321c7454b 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -867,4 +867,25 @@ describe('<webview> tag', function () {
     })
     w.loadURL('file://' + fixtures + '/pages/webview-zoom-factor.html')
   })
+
+  it('has the initial hidden state and receives visibilitychange events', function (done) {
+    w = new BrowserWindow({
+      show: false
+    })
+
+    ipcMain.once('pong', function (event, visibilityState, hidden) {
+      assert.equal(visibilityState, 'hidden')
+      assert.equal(hidden, true)
+
+      w.webContents.send('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', 'visible')
+
+      ipcMain.once('pong', function (event, visibilityState, hidden) {
+        assert.equal(visibilityState, 'visible')
+        assert.equal(hidden, false)
+        done()
+      })
+    })
+
+    w.loadURL('file://' + fixtures + '/pages/webview-visibilitychange.html')
+  })
 })

From 73b07f76a3004ea64ef88f94161ab820d98cbf42 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 12:44:09 -0700
Subject: [PATCH 396/510] Support document visiblity state and events in
 webviews

---
 atom/browser/web_contents_preferences.cc | 9 ++++++++-
 atom/common/options_switches.cc          | 4 ++++
 atom/common/options_switches.h           | 2 ++
 lib/browser/guest-view-manager.js        | 3 ++-
 lib/renderer/web-view/web-view.js        | 9 ++++++++-
 spec/webview-spec.js                     | 2 +-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index bfaca8d7ca77..f57274527fc6 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -160,7 +160,14 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
   if (window) {
     bool visible = window->IsVisible() && !window->IsMinimized();
     if (!visible)  // Default state is visible.
-      command_line->AppendSwitch("hidden-page");
+      command_line->AppendSwitch(switches::kHiddenPage);
+  } else {
+    // Inherit initial visibilty state from parent window in webviews
+    bool hidden_page;
+    if (web_preferences.GetBoolean(options::kHiddenPage, &hidden_page) &&
+        hidden_page) {
+      command_line->AppendSwitch(switches::kHiddenPage);
+    }
   }
 }
 
diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index de130eee13eb..05c2284cbbc7 100644
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -103,6 +103,9 @@ const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
 // Opener window's ID.
 const char kOpenerID[] = "openerId";
 
+// Page is hidden.
+const char kHiddenPage[] = "hiddenPage";
+
 // Enable the rubber banding effect.
 const char kScrollBounce[] = "scrollBounce";
 
@@ -146,6 +149,7 @@ const char kPreloadURL[]      = "preload-url";
 const char kNodeIntegration[] = "node-integration";
 const char kGuestInstanceID[] = "guest-instance-id";
 const char kOpenerID[]        = "opener-id";
+const char kHiddenPage[]      = "hidden-page";
 const char kScrollBounce[]    = "scroll-bounce";
 
 // Widevine options
diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index fadde79f18c8..b54972288eed 100644
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -56,6 +56,7 @@ extern const char kGuestInstanceID[];
 extern const char kExperimentalFeatures[];
 extern const char kExperimentalCanvasFeatures[];
 extern const char kOpenerID[];
+extern const char kHiddenPage[];
 extern const char kScrollBounce[];
 extern const char kBlinkFeatures[];
 
@@ -82,6 +83,7 @@ extern const char kPreloadURL[];
 extern const char kNodeIntegration[];
 extern const char kGuestInstanceID[];
 extern const char kOpenerID[];
+extern const char kHiddenPage[];
 extern const char kScrollBounce[];
 
 extern const char kWidevineCdmPath[];
diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 6876a8d22c12..57ed14af5d22 100644
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -181,7 +181,8 @@ var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params
     plugins: params.plugins,
     zoomFactor: params.zoomFactor,
     webSecurity: !params.disablewebsecurity,
-    blinkFeatures: params.blinkfeatures
+    blinkFeatures: params.blinkfeatures,
+    hiddenPage: params.hiddenPage
   }
 
   if (params.preload) {
diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index 1636d560ee53..fd44d925e456 100644
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -42,6 +42,11 @@ var WebViewImpl = (function () {
       this.webviewNode.setZoomLevel(zoomLevel)
     }
     webFrame.on('zoom-level-changed', this.onZoomLevelChanged)
+
+    this.onVisibilityChanged = (event, visibilityState) => {
+      this.webviewNode.send('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', visibilityState)
+    }
+    ipcRenderer.on('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', this.onVisibilityChanged)
   }
 
   WebViewImpl.prototype.createBrowserPluginNode = function () {
@@ -56,6 +61,7 @@ var WebViewImpl = (function () {
   WebViewImpl.prototype.reset = function () {
     // Unlisten the zoom-level-changed event.
     webFrame.removeListener('zoom-level-changed', this.onZoomLevelChanged)
+    ipcRenderer.removeListener('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', this.onVisibilityChanged)
 
     // If guestInstanceId is defined then the <webview> has navigated and has
     // already picked up a partition ID. Thus, we need to reset the initialization
@@ -224,7 +230,8 @@ var WebViewImpl = (function () {
     params = {
       instanceId: this.viewInstanceId,
       userAgentOverride: this.userAgentOverride,
-      zoomFactor: webFrame.getZoomFactor()
+      zoomFactor: webFrame.getZoomFactor(),
+      hiddenPage: document.hidden
     }
     ref1 = this.attributes
     for (attributeName in ref1) {
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 754321c7454b..4b1abbfe92a1 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -868,7 +868,7 @@ describe('<webview> tag', function () {
     w.loadURL('file://' + fixtures + '/pages/webview-zoom-factor.html')
   })
 
-  it('has the initial hidden state and receives visibilitychange events', function (done) {
+  it('inherits the parent window hidden state and receives visibilitychange events', function (done) {
     w = new BrowserWindow({
       show: false
     })

From 4e68a8d16eb53b96a6f3d9b6b0254afffeec559a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 12:47:12 -0700
Subject: [PATCH 397/510] Remove logging in parent page

---
 spec/fixtures/pages/webview-visibilitychange.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/fixtures/pages/webview-visibilitychange.html b/spec/fixtures/pages/webview-visibilitychange.html
index b0f05056382e..7c8b7cef9df5 100644
--- a/spec/fixtures/pages/webview-visibilitychange.html
+++ b/spec/fixtures/pages/webview-visibilitychange.html
@@ -1,8 +1,5 @@
 <html>
 <body>
-<script>
-  console.log(document.visibilityState, document.hidden)
-</script>
 <webview nodeintegration src="visibilitychange.html"/>
 </body>
 </html>

From 69c69880e5f86e75bb659014e7758a2bc0eceef3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 May 2016 12:47:37 -0700
Subject: [PATCH 398/510] Tweak spec description

---
 spec/webview-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 4b1abbfe92a1..7bdb3a632e0c 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -868,7 +868,7 @@ describe('<webview> tag', function () {
     w.loadURL('file://' + fixtures + '/pages/webview-zoom-factor.html')
   })
 
-  it('inherits the parent window hidden state and receives visibilitychange events', function (done) {
+  it('inherits the parent window visibility state and receives visibilitychange events', function (done) {
     w = new BrowserWindow({
       show: false
     })

From 583bb49f6cd2241a9ea02fcbc0e056e85e3104d1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:13:12 -0700
Subject: [PATCH 399/510] Get hidden state by using parent window directly

---
 atom/browser/api/atom_api_web_view_manager.cc | 14 ++-----------
 atom/browser/web_contents_preferences.cc      | 21 ++++++++++++-------
 atom/browser/web_view_manager.cc              | 20 +++++++++++++++++-
 atom/browser/web_view_manager.h               |  5 +++++
 lib/browser/guest-view-manager.js             |  3 +--
 lib/renderer/web-view/web-view.js             |  3 +--
 6 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/atom/browser/api/atom_api_web_view_manager.cc b/atom/browser/api/atom_api_web_view_manager.cc
index f06c1105526e..1586c3a10dde 100644
--- a/atom/browser/api/atom_api_web_view_manager.cc
+++ b/atom/browser/api/atom_api_web_view_manager.cc
@@ -14,22 +14,12 @@ using atom::WebContentsPreferences;
 
 namespace {
 
-atom::WebViewManager* GetWebViewManager(content::WebContents* web_contents) {
-  auto context = web_contents->GetBrowserContext();
-  if (context) {
-    auto manager = context->GetGuestManager();
-    return static_cast<atom::WebViewManager*>(manager);
-  } else {
-    return nullptr;
-  }
-}
-
 void AddGuest(int guest_instance_id,
               int element_instance_id,
               content::WebContents* embedder,
               content::WebContents* guest_web_contents,
               const base::DictionaryValue& options) {
-  auto manager = GetWebViewManager(embedder);
+  auto manager = atom::WebViewManager::GetWebViewManager(embedder);
   if (manager)
     manager->AddGuest(guest_instance_id, element_instance_id, embedder,
                       guest_web_contents);
@@ -38,7 +28,7 @@ void AddGuest(int guest_instance_id,
 }
 
 void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
-  auto manager = GetWebViewManager(embedder);
+  auto manager = atom::WebViewManager::GetWebViewManager(embedder);
   if (manager)
     manager->RemoveGuest(guest_instance_id);
 }
diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index f57274527fc6..5e1971063fac 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "atom/browser/native_window.h"
+#include "atom/browser/web_view_manager.h"
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
@@ -155,19 +156,23 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
     command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures,
                                     blink_features);
 
-  // The initial visibility state.
   NativeWindow* window = NativeWindow::FromWebContents(web_contents);
+
+  // Inherit initial visibilty state from parent window in webviews
+  if (guest_instance_id && !window) {
+    auto manager = WebViewManager::GetWebViewManager(web_contents);
+    if (manager) {
+      content::WebContents* embedder = manager->GetEmbedder(guest_instance_id);
+      if (embedder)
+        window = NativeWindow::FromWebContents(embedder);
+    }
+  }
+
+  // The initial visibility state.
   if (window) {
     bool visible = window->IsVisible() && !window->IsMinimized();
     if (!visible)  // Default state is visible.
       command_line->AppendSwitch(switches::kHiddenPage);
-  } else {
-    // Inherit initial visibilty state from parent window in webviews
-    bool hidden_page;
-    if (web_preferences.GetBoolean(options::kHiddenPage, &hidden_page) &&
-        hidden_page) {
-      command_line->AppendSwitch(switches::kHiddenPage);
-    }
   }
 }
 
diff --git a/atom/browser/web_view_manager.cc b/atom/browser/web_view_manager.cc
index d404c1a43680..321820bc2f61 100644
--- a/atom/browser/web_view_manager.cc
+++ b/atom/browser/web_view_manager.cc
@@ -6,7 +6,6 @@
 
 #include "atom/browser/atom_browser_context.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/browser/web_contents.h"
 
 namespace atom {
 
@@ -42,6 +41,13 @@ void WebViewManager::RemoveGuest(int guest_instance_id) {
     }
 }
 
+content::WebContents* WebViewManager::GetEmbedder(int guest_instance_id) {
+  if (ContainsKey(web_contents_embedder_map_, guest_instance_id))
+    return web_contents_embedder_map_[guest_instance_id].embedder;
+  else
+    return nullptr;
+}
+
 content::WebContents* WebViewManager::GetGuestByInstanceID(
     int owner_process_id,
     int element_instance_id) {
@@ -65,4 +71,16 @@ bool WebViewManager::ForEachGuest(content::WebContents* embedder_web_contents,
   return false;
 }
 
+// static
+WebViewManager* WebViewManager::GetWebViewManager(content::WebContents* web_contents) {
+  auto context = web_contents->GetBrowserContext();
+  if (context) {
+    auto manager = context->GetGuestManager();
+    return static_cast<atom::WebViewManager*>(manager);
+  } else {
+    return nullptr;
+  }
+}
+
+
 }  // namespace atom
diff --git a/atom/browser/web_view_manager.h b/atom/browser/web_view_manager.h
index ff9a8ecba2ab..b956fa76ecff 100644
--- a/atom/browser/web_view_manager.h
+++ b/atom/browser/web_view_manager.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "content/public/browser/browser_plugin_guest_manager.h"
+#include "content/public/browser/web_contents.h"
 
 namespace atom {
 
@@ -22,6 +23,10 @@ class WebViewManager : public content::BrowserPluginGuestManager {
                 content::WebContents* web_contents);
   void RemoveGuest(int guest_instance_id);
 
+  content::WebContents* GetEmbedder(int guest_instance_id);
+
+  static WebViewManager* GetWebViewManager(content::WebContents* web_contents);
+
  protected:
   // content::BrowserPluginGuestManager:
   content::WebContents* GetGuestByInstanceID(int owner_process_id,
diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 57ed14af5d22..6876a8d22c12 100644
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -181,8 +181,7 @@ var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params
     plugins: params.plugins,
     zoomFactor: params.zoomFactor,
     webSecurity: !params.disablewebsecurity,
-    blinkFeatures: params.blinkfeatures,
-    hiddenPage: params.hiddenPage
+    blinkFeatures: params.blinkfeatures
   }
 
   if (params.preload) {
diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index fd44d925e456..e9d300aabbcb 100644
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -230,8 +230,7 @@ var WebViewImpl = (function () {
     params = {
       instanceId: this.viewInstanceId,
       userAgentOverride: this.userAgentOverride,
-      zoomFactor: webFrame.getZoomFactor(),
-      hiddenPage: document.hidden
+      zoomFactor: webFrame.getZoomFactor()
     }
     ref1 = this.attributes
     for (attributeName in ref1) {

From f58322891b568e2fc32b4eb46703d96183e70897 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:17:35 -0700
Subject: [PATCH 400/510] Remove added switch/option

---
 atom/browser/web_contents_preferences.cc | 2 +-
 atom/browser/web_view_manager.cc         | 1 -
 atom/common/options_switches.cc          | 4 ----
 atom/common/options_switches.h           | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 5e1971063fac..c7ff0cfcef14 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -172,7 +172,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
   if (window) {
     bool visible = window->IsVisible() && !window->IsMinimized();
     if (!visible)  // Default state is visible.
-      command_line->AppendSwitch(switches::kHiddenPage);
+      command_line->AppendSwitch("hidden-page");
   }
 }
 
diff --git a/atom/browser/web_view_manager.cc b/atom/browser/web_view_manager.cc
index 321820bc2f61..d0d35d5f75af 100644
--- a/atom/browser/web_view_manager.cc
+++ b/atom/browser/web_view_manager.cc
@@ -82,5 +82,4 @@ WebViewManager* WebViewManager::GetWebViewManager(content::WebContents* web_cont
   }
 }
 
-
 }  // namespace atom
diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index 05c2284cbbc7..de130eee13eb 100644
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -103,9 +103,6 @@ const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
 // Opener window's ID.
 const char kOpenerID[] = "openerId";
 
-// Page is hidden.
-const char kHiddenPage[] = "hiddenPage";
-
 // Enable the rubber banding effect.
 const char kScrollBounce[] = "scrollBounce";
 
@@ -149,7 +146,6 @@ const char kPreloadURL[]      = "preload-url";
 const char kNodeIntegration[] = "node-integration";
 const char kGuestInstanceID[] = "guest-instance-id";
 const char kOpenerID[]        = "opener-id";
-const char kHiddenPage[]      = "hidden-page";
 const char kScrollBounce[]    = "scroll-bounce";
 
 // Widevine options
diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index b54972288eed..fadde79f18c8 100644
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -56,7 +56,6 @@ extern const char kGuestInstanceID[];
 extern const char kExperimentalFeatures[];
 extern const char kExperimentalCanvasFeatures[];
 extern const char kOpenerID[];
-extern const char kHiddenPage[];
 extern const char kScrollBounce[];
 extern const char kBlinkFeatures[];
 
@@ -83,7 +82,6 @@ extern const char kPreloadURL[];
 extern const char kNodeIntegration[];
 extern const char kGuestInstanceID[];
 extern const char kOpenerID[];
-extern const char kHiddenPage[];
 extern const char kScrollBounce[];
 
 extern const char kWidevineCdmPath[];

From 03c6fbf80f404c2b67905675f69089c896085b1d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:20:00 -0700
Subject: [PATCH 401/510] :art:

---
 atom/browser/web_view_manager.cc | 3 ++-
 atom/browser/web_view_manager.h  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/web_view_manager.cc b/atom/browser/web_view_manager.cc
index d0d35d5f75af..a1c5d898dbbb 100644
--- a/atom/browser/web_view_manager.cc
+++ b/atom/browser/web_view_manager.cc
@@ -72,7 +72,8 @@ bool WebViewManager::ForEachGuest(content::WebContents* embedder_web_contents,
 }
 
 // static
-WebViewManager* WebViewManager::GetWebViewManager(content::WebContents* web_contents) {
+WebViewManager* WebViewManager::GetWebViewManager(
+    content::WebContents* web_contents) {
   auto context = web_contents->GetBrowserContext();
   if (context) {
     auto manager = context->GetGuestManager();
diff --git a/atom/browser/web_view_manager.h b/atom/browser/web_view_manager.h
index b956fa76ecff..da1e51bccc0b 100644
--- a/atom/browser/web_view_manager.h
+++ b/atom/browser/web_view_manager.h
@@ -22,7 +22,6 @@ class WebViewManager : public content::BrowserPluginGuestManager {
                 content::WebContents* embedder,
                 content::WebContents* web_contents);
   void RemoveGuest(int guest_instance_id);
-
   content::WebContents* GetEmbedder(int guest_instance_id);
 
   static WebViewManager* GetWebViewManager(content::WebContents* web_contents);

From b1ce57faa993b16ee28d2fdc546b673b96ab6c86 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:22:43 -0700
Subject: [PATCH 402/510] Remove redundant atom:: namespace use

---
 atom/browser/web_view_manager.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_view_manager.cc b/atom/browser/web_view_manager.cc
index a1c5d898dbbb..02d40160fa60 100644
--- a/atom/browser/web_view_manager.cc
+++ b/atom/browser/web_view_manager.cc
@@ -77,7 +77,7 @@ WebViewManager* WebViewManager::GetWebViewManager(
   auto context = web_contents->GetBrowserContext();
   if (context) {
     auto manager = context->GetGuestManager();
-    return static_cast<atom::WebViewManager*>(manager);
+    return static_cast<WebViewManager*>(manager);
   } else {
     return nullptr;
   }

From 89ffa02d7540ef5ecb6412a8c427f11038226354 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:26:05 -0700
Subject: [PATCH 403/510] Tweak comment

---
 atom/browser/web_contents_preferences.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index c7ff0cfcef14..cdd563316281 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -158,7 +158,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
 
   NativeWindow* window = NativeWindow::FromWebContents(web_contents);
 
-  // Inherit initial visibilty state from parent window in webviews
+  // Use parent window for webviews
   if (guest_instance_id && !window) {
     auto manager = WebViewManager::GetWebViewManager(web_contents);
     if (manager) {

From 6632547b178b34fe16687b88e656f1d0c8f70a3d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:26:20 -0700
Subject: [PATCH 404/510] parent -> embedder

---
 atom/browser/web_contents_preferences.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index cdd563316281..30635792a1c9 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -158,7 +158,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
 
   NativeWindow* window = NativeWindow::FromWebContents(web_contents);
 
-  // Use parent window for webviews
+  // Use embedder window for webviews
   if (guest_instance_id && !window) {
     auto manager = WebViewManager::GetWebViewManager(web_contents);
     if (manager) {

From 814e4377a402aa94f49d45f5ca3a1a29b6cb8e59 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:26:59 -0700
Subject: [PATCH 405/510] Restore original comment position

---
 atom/browser/web_contents_preferences.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 30635792a1c9..9ad778970cdc 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -156,6 +156,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
     command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures,
                                     blink_features);
 
+  // The initial visibility state.
   NativeWindow* window = NativeWindow::FromWebContents(web_contents);
 
   // Use embedder window for webviews
@@ -168,7 +169,6 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
     }
   }
 
-  // The initial visibility state.
   if (window) {
     bool visible = window->IsVisible() && !window->IsMinimized();
     if (!visible)  // Default state is visible.

From 88f665bc1bc26343d39d0f7996ef57f19ac67814 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:28:35 -0700
Subject: [PATCH 406/510] Restore original include location

---
 atom/browser/web_view_manager.cc | 1 +
 atom/browser/web_view_manager.h  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_view_manager.cc b/atom/browser/web_view_manager.cc
index 02d40160fa60..815e60a166ca 100644
--- a/atom/browser/web_view_manager.cc
+++ b/atom/browser/web_view_manager.cc
@@ -6,6 +6,7 @@
 
 #include "atom/browser/atom_browser_context.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_contents.h"
 
 namespace atom {
 
diff --git a/atom/browser/web_view_manager.h b/atom/browser/web_view_manager.h
index da1e51bccc0b..eb2ba8ad42c8 100644
--- a/atom/browser/web_view_manager.h
+++ b/atom/browser/web_view_manager.h
@@ -8,7 +8,6 @@
 #include <map>
 
 #include "content/public/browser/browser_plugin_guest_manager.h"
-#include "content/public/browser/web_contents.h"
 
 namespace atom {
 

From 75754804affb026400f47110619b79fc54413bd8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 10:34:33 -0700
Subject: [PATCH 407/510] Use auto for embedder var

---
 atom/browser/web_contents_preferences.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 9ad778970cdc..82f2023329e6 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -163,7 +163,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
   if (guest_instance_id && !window) {
     auto manager = WebViewManager::GetWebViewManager(web_contents);
     if (manager) {
-      content::WebContents* embedder = manager->GetEmbedder(guest_instance_id);
+      auto embedder = manager->GetEmbedder(guest_instance_id);
       if (embedder)
         window = NativeWindow::FromWebContents(embedder);
     }

From bef6748c0625325fe458fed455d4ce3387ae876f Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Wed, 25 May 2016 16:20:49 -0700
Subject: [PATCH 408/510] :art: Implement JS Standard Code Style 7

Updates Standard Code Style to 7 (latest major) and ensures that code
is conform.

 * camelCase is now enforced
 * No assignments in return statements
---
 lib/browser/api/menu-item.js |  4 +++-
 lib/common/asar.js           | 14 +++++++-------
 lib/renderer/override.js     |  5 +++--
 package.json                 |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/browser/api/menu-item.js b/lib/browser/api/menu-item.js
index 20666b0f36ea..f50e0ed84e52 100644
--- a/lib/browser/api/menu-item.js
+++ b/lib/browser/api/menu-item.js
@@ -89,7 +89,9 @@ MenuItem = (function () {
     if (defaultValue == null) {
       defaultValue = null
     }
-    return this[name] != null ? this[name] : this[name] = defaultValue
+    this[name] != null ? this[name] : this[name] = defaultValue
+
+    return this[name]
   }
 
   MenuItem.prototype.overrideReadOnlyProperty = function (name, defaultValue) {
diff --git a/lib/common/asar.js b/lib/common/asar.js
index 1d8474d1c563..6adc24e8ded0 100644
--- a/lib/common/asar.js
+++ b/lib/common/asar.js
@@ -1,6 +1,6 @@
 (function () {
   const asar = process.binding('atom_common_asar')
-  const child_process = require('child_process')
+  const childProcess = require('child_process')
   const path = require('path')
   const util = require('util')
 
@@ -591,13 +591,13 @@
     }
 
     // Executing a command string containing a path to an asar
-    // archive confuses `child_process.execFile`, which is internally
-    // called by `child_process.{exec,execSync}`, causing
+    // archive confuses `childProcess.execFile`, which is internally
+    // called by `childProcess.{exec,execSync}`, causing
     // Electron to consider the full command as a single path
     // to an archive.
     [ 'exec', 'execSync' ].forEach(function (functionName) {
-      var old = child_process[functionName]
-      child_process[functionName] = function () {
+      var old = childProcess[functionName]
+      childProcess[functionName] = function () {
         var processNoAsarOriginalValue = process.noAsar
         process.noAsar = true
         var result = old.apply(this, arguments)
@@ -607,10 +607,10 @@
     })
 
     overrideAPI(fs, 'open')
-    overrideAPI(child_process, 'execFile')
+    overrideAPI(childProcess, 'execFile')
     overrideAPISync(process, 'dlopen', 1)
     overrideAPISync(require('module')._extensions, '.node', 1)
     overrideAPISync(fs, 'openSync')
-    return overrideAPISync(child_process, 'execFileSync')
+    return overrideAPISync(childProcess, 'execFileSync')
   }
 })()
diff --git a/lib/renderer/override.js b/lib/renderer/override.js
index 8d47573b2fea..35ca80f16afe 100644
--- a/lib/renderer/override.js
+++ b/lib/renderer/override.js
@@ -15,8 +15,9 @@ var BrowserWindowProxy = (function () {
   BrowserWindowProxy.proxies = {}
 
   BrowserWindowProxy.getOrCreate = function (guestId) {
-    var base
-    return (base = this.proxies)[guestId] != null ? base[guestId] : base[guestId] = new BrowserWindowProxy(guestId)
+    var base = this.proxies
+    base[guestId] != null ? base[guestId] : base[guestId] = new BrowserWindowProxy(guestId)
+    return base[guestId]
   }
 
   BrowserWindowProxy.remove = function (guestId) {
diff --git a/package.json b/package.json
index 89837aa70f21..6a515cb26e10 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",
-    "standard": "^6.0.8"
+    "standard": "^7.1.0"
   },
   "optionalDependencies": {
     "runas": "^3.0.0"

From d1c302800f9268852cbceaea104f4ad02f881d5a Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Wed, 25 May 2016 19:25:51 -0400
Subject: [PATCH 409/510] Fix: Properly notify observers when window prevents
 close

---
 atom/browser/native_window_mac.mm   | 6 ++++++
 atom/browser/native_window_views.cc | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index cc31d308d144..d7f2350e4b04 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "atom/browser/window_list.h"
 #include "atom/common/color_util.h"
 #include "atom/common/draggable_region.h"
 #include "atom/common/options_switches.h"
@@ -553,6 +554,11 @@ NativeWindowMac::~NativeWindowMac() {
 }
 
 void NativeWindowMac::Close() {
+  if (!IsClosable()) {
+    WindowList::WindowCloseCancelled(this);
+    return;
+  }
+
   [window_ performClose:nil];
 }
 
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 82c1158bdcf1..21bff6388a66 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -9,6 +9,7 @@
 
 #include "atom/browser/ui/views/menu_bar.h"
 #include "atom/browser/ui/views/menu_layout.h"
+#include "atom/browser/window_list.h"
 #include "atom/common/color_util.h"
 #include "atom/common/draggable_region.h"
 #include "atom/common/native_mate_converters/image_converter.h"
@@ -284,6 +285,11 @@ NativeWindowViews::~NativeWindowViews() {
 }
 
 void NativeWindowViews::Close() {
+  if (!IsClosable()) {
+    WindowList::WindowCloseCancelled(this);
+    return;
+  }
+
   window_->Close();
 }
 

From 4e44900930b513316a2915f70d21731a02c33d31 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 25 May 2016 18:05:37 -0700
Subject: [PATCH 410/510] Initialize guest_instance_id

---
 atom/browser/web_contents_preferences.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 82f2023329e6..ef9fc4df0b8c 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -131,7 +131,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
                                     base::DoubleToString(zoom_factor));
 
   // --guest-instance-id, which is used to identify guest WebContents.
-  int guest_instance_id;
+  int guest_instance_id = 0;
   if (web_preferences.GetInteger(options::kGuestInstanceID, &guest_instance_id))
     command_line->AppendSwitchASCII(switches::kGuestInstanceID,
                                     base::IntToString(guest_instance_id));

From 0b9c11a5f230e55cc6d5c4a097c7f9cc927f2a88 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 10:06:25 +0900
Subject: [PATCH 411/510] Fix pylint warnings

---
 script/upload.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/upload.py b/script/upload.py
index a7ac8f4472ac..9faf4fa8d05b 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -9,8 +9,8 @@ import tempfile
 
 from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
                        get_platform_key, get_env_var
-from lib.util import electron_gyp, execute, get_electron_version, parse_version, \
-                     scoped_cwd
+from lib.util import electron_gyp, execute, get_electron_version, \
+                     parse_version, scoped_cwd
 from lib.github import GitHub
 
 

From eb8284e2852536df4a493ecf9d48f77f64009833 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 14:39:09 +0900
Subject: [PATCH 412/510] Update to Chrome 51.0.2704.63

---
 atom/common/chrome_version.h | 2 +-
 script/lib/config.py         | 2 +-
 vendor/brightray             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h
index 3abf4d4252c7..f84f6ac15516 100644
--- a/atom/common/chrome_version.h
+++ b/atom/common/chrome_version.h
@@ -8,7 +8,7 @@
 #ifndef ATOM_COMMON_CHROME_VERSION_H_
 #define ATOM_COMMON_CHROME_VERSION_H_
 
-#define CHROME_VERSION_STRING "51.0.2704.54"
+#define CHROME_VERSION_STRING "51.0.2704.63"
 #define CHROME_VERSION "v" CHROME_VERSION_STRING
 
 #endif  // ATOM_COMMON_CHROME_VERSION_H_
diff --git a/script/lib/config.py b/script/lib/config.py
index 26d91622035f..006faf1b920a 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '31ff4384348b139d9e138d4df41b85a11d1a4dbb'
+LIBCHROMIUMCONTENT_COMMIT = 'eda589282bd7729f36960d2e669d4b81375b897c'
 
 PLATFORM = {
   'cygwin': 'win32',
diff --git a/vendor/brightray b/vendor/brightray
index 8baf0b10bdf9..e9b2a4ffa292 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 8baf0b10bdf9c649463ee0b7c7f7a34c0332c285
+Subproject commit e9b2a4ffa29209fbd12a0b1613e8633d42f0b103

From c1272743b922d8f2f2990977a863c5776c4c36cf Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 18:07:52 +0900
Subject: [PATCH 413/510] Bump v1.2.0

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 4 ++--
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index 537cb3c1571e..f1c6b4137061 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.1.2</string>
+  <string>1.2.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.2</string>
+  <string>1.2.0</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 2e4af3997b9d..701e6fe29480 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,2,0
- PRODUCTVERSION 1,1,2,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.1.2"
+            VALUE "FileVersion", "1.2.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.1.2"
+            VALUE "ProductVersion", "1.2.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index f62faf5f4482..cf2ef14d8ccd 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -6,8 +6,8 @@
 #define ATOM_VERSION_H
 
 #define ATOM_MAJOR_VERSION 1
-#define ATOM_MINOR_VERSION 1
-#define ATOM_PATCH_VERSION 2
+#define ATOM_MINOR_VERSION 2
+#define ATOM_PATCH_VERSION 0
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index a4f48b922ad3..c11444121531 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.1.2',
+    'version%': '1.2.0',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index 6a515cb26e10..d96ed1cd42ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From f29598d9078957477f7b153ae9a0c0094fd1536e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 16:10:05 +0900
Subject: [PATCH 414/510] getHostForPath => generateHostForPath

The original name implies no side effect, but is is not true.
---
 lib/browser/chrome-extension.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 6924f9a7d509..7a1d267cd045 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -7,7 +7,7 @@ const url = require('url')
 var hostPathMap = {}
 var hostPathMapNextKey = 0
 
-var getHostForPath = function (path) {
+var generateHostForPath = function (path) {
   var key
   key = 'extension-' + (++hostPathMapNextKey)
   hostPathMap[key] = path
@@ -30,7 +30,7 @@ var getExtensionInfoFromPath = function (srcDirectory) {
     page = url.format({
       protocol: 'chrome-extension',
       slashes: true,
-      hostname: getHostForPath(srcDirectory),
+      hostname: generateHostForPath(srcDirectory),
       pathname: manifest.devtools_page
     })
     extensionInfoMap[manifest.name] = {

From 513b66f2079b4871028d391305ee9de13c54c12a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 16:34:57 +0900
Subject: [PATCH 415/510] Cleanup chrome-extension.js after the Coffe2ES
 transfer

---
 lib/browser/chrome-extension.js | 106 +++++++++++++++-----------------
 1 file changed, 48 insertions(+), 58 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 7a1d267cd045..26734ca809e8 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -3,31 +3,34 @@ const fs = require('fs')
 const path = require('path')
 const url = require('url')
 
-// Mapping between hostname and file path.
-var hostPathMap = {}
-var hostPathMapNextKey = 0
+// Remove this when we have Object.values().
+const objectValues = function (object) {
+  return Object.keys(object).map(function (key) { return object[key] })
+}
 
-var generateHostForPath = function (path) {
-  var key
-  key = 'extension-' + (++hostPathMapNextKey)
+// Mapping between hostname and file path.
+let hostPathMap = {}
+let hostPathMapNextKey = 0
+
+const generateHostForPath = function (path) {
+  let key = `extension-${++hostPathMapNextKey}`
   hostPathMap[key] = path
   return key
 }
 
-var getPathForHost = function (host) {
+const getPathForHost = function (host) {
   return hostPathMap[host]
 }
 
 // Cache extensionInfo.
-var extensionInfoMap = {}
+let extensionInfoMap = {}
 
-var getExtensionInfoFromPath = function (srcDirectory) {
-  var manifest, page
-  manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
+const getExtensionInfoFromPath = function (srcDirectory) {
+  let manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
   if (extensionInfoMap[manifest.name] == null) {
     // We can not use 'file://' directly because all resources in the extension
     // will be treated as relative to the root in Chrome.
-    page = url.format({
+    let page = url.format({
       protocol: 'chrome-extension',
       slashes: true,
       hostname: generateHostForPath(srcDirectory),
@@ -43,13 +46,18 @@ var getExtensionInfoFromPath = function (srcDirectory) {
   }
 }
 
-// The loaded extensions cache and its persistent path.
-var loadedExtensions = null
-var loadedExtensionsPath = null
+// Load the extensions for the window.
+const loadDevToolsExtensions = function (win, extensionInfoArray) {
+  if (!win.devToolsWebContents) return
+  win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)
+}
+
+// The persistent path of "DevTools Extensions" preference file.
+let loadedExtensionsPath = null
 
 app.on('will-quit', function () {
   try {
-    loadedExtensions = Object.keys(extensionInfoMap).map(function (key) {
+    let loadedExtensions = Object.keys(extensionInfoMap).map(function (key) {
       return extensionInfoMap[key].srcDirectory
     })
     if (loadedExtensions.length > 0) {
@@ -69,74 +77,56 @@ app.on('will-quit', function () {
 
 // We can not use protocol or BrowserWindow until app is ready.
 app.once('ready', function () {
-  var chromeExtensionHandler, i, init, len, srcDirectory
-
   // Load persisted extensions.
   loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions')
   try {
-    loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
-    if (!Array.isArray(loadedExtensions)) {
-      loadedExtensions = []
-    }
-
-    // Preheat the extensionInfo cache.
-    for (i = 0, len = loadedExtensions.length; i < len; i++) {
-      srcDirectory = loadedExtensions[i]
-      getExtensionInfoFromPath(srcDirectory)
+    let loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
+    if (Array.isArray(loadedExtensions)) {
+      // Preheat the extensionInfo cache.
+      for (let srcDirectory of loadedExtensions) {
+        getExtensionInfoFromPath(srcDirectory)
+      }
     }
   } catch (error) {
     // Ignore error
   }
 
   // The chrome-extension: can map a extension URL request to real file path.
-  chromeExtensionHandler = function (request, callback) {
-    var directory, parsed
-    parsed = url.parse(request.url)
-    if (!(parsed.hostname && (parsed.path != null))) {
-      return callback()
-    }
-    if (!/extension-\d+/.test(parsed.hostname)) {
-      return callback()
-    }
-    directory = getPathForHost(parsed.hostname)
-    if (directory == null) {
-      return callback()
-    }
-    return callback(path.join(directory, parsed.path))
+  const chromeExtensionHandler = function (request, callback) {
+    let parsed = url.parse(request.url)
+    if (!parsed.hostname || !parsed.path) return callback()
+    if (!/extension-\d+/.test(parsed.hostname)) return callback()
+
+    let directory = getPathForHost(parsed.hostname)
+    if (!directory) return callback()
+
+    callback(path.join(directory, parsed.path))
   }
   protocol.registerFileProtocol('chrome-extension', chromeExtensionHandler, function (error) {
     if (error) {
-      return console.error('Unable to register chrome-extension protocol')
+      console.error(`Unable to register chrome-extension protocol: ${error}`)
     }
   })
-  BrowserWindow.prototype._loadDevToolsExtensions = function (extensionInfoArray) {
-    var ref
-    return (ref = this.devToolsWebContents) != null ? ref.executeJavaScript('DevToolsAPI.addExtensions(' + (JSON.stringify(extensionInfoArray)) + ');') : void 0
-  }
+
   BrowserWindow.addDevToolsExtension = function (srcDirectory) {
-    var extensionInfo, j, len1, ref, window
-    extensionInfo = getExtensionInfoFromPath(srcDirectory)
+    let extensionInfo = getExtensionInfoFromPath(srcDirectory)
     if (extensionInfo) {
-      ref = BrowserWindow.getAllWindows()
-      for (j = 0, len1 = ref.length; j < len1; j++) {
-        window = ref[j]
-        window._loadDevToolsExtensions([extensionInfo])
+      for (let win of BrowserWindow.getAllWindows()) {
+        loadDevToolsExtensions(win, [extensionInfo])
       }
       return extensionInfo.name
     }
   }
   BrowserWindow.removeDevToolsExtension = function (name) {
-    return delete extensionInfoMap[name]
+    delete extensionInfoMap[name]
   }
 
   // Load persisted extensions when devtools is opened.
-  init = BrowserWindow.prototype._init
+  let init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)
-    return this.webContents.on('devtools-opened', () => {
-      return this._loadDevToolsExtensions(Object.keys(extensionInfoMap).map(function (key) {
-        return extensionInfoMap[key]
-      }))
+    this.webContents.on('devtools-opened', () => {
+      loadDevToolsExtensions(this, objectValues(extensionInfoMap))
     })
   }
 })

From 99c1434051026399a125706a8e113d67bf15da83 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 16:57:23 +0900
Subject: [PATCH 416/510] Store the original manifest file

---
 lib/browser/chrome-extension.js | 52 +++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 26734ca809e8..e882b1862d4e 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -3,7 +3,7 @@ const fs = require('fs')
 const path = require('path')
 const url = require('url')
 
-// Remove this when we have Object.values().
+// TODO(zcbenz): Remove this when we have Object.values().
 const objectValues = function (object) {
   return Object.keys(object).map(function (key) { return object[key] })
 }
@@ -22,27 +22,23 @@ const getPathForHost = function (host) {
   return hostPathMap[host]
 }
 
-// Cache extensionInfo.
-let extensionInfoMap = {}
+// Cache manifests.
+let manifestMap = {}
 
-const getExtensionInfoFromPath = function (srcDirectory) {
+const getManifestFromPath = function (srcDirectory) {
   let manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
-  if (extensionInfoMap[manifest.name] == null) {
+  if (!manifestMap[manifest.name]) {
+    manifestMap[manifest.name] = manifest
     // We can not use 'file://' directly because all resources in the extension
     // will be treated as relative to the root in Chrome.
-    let page = url.format({
+    manifest.startPage = url.format({
       protocol: 'chrome-extension',
       slashes: true,
       hostname: generateHostForPath(srcDirectory),
       pathname: manifest.devtools_page
     })
-    extensionInfoMap[manifest.name] = {
-      startPage: page,
-      name: manifest.name,
-      srcDirectory: srcDirectory,
-      exposeExperimentalAPIs: true
-    }
-    return extensionInfoMap[manifest.name]
+    manifest.srcDirectory = srcDirectory
+    return manifest
   }
 }
 
@@ -52,13 +48,24 @@ const loadDevToolsExtensions = function (win, extensionInfoArray) {
   win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)
 }
 
+// Transfer the |manifest| to a format that can be recognized by the
+// |DevToolsAPI.addExtensions|.
+const manifestToExtensionInfo = function (manifest) {
+  return {
+    startPage: manifest.startPage,
+    srcDirectory: manifest.srcDirectory,
+    name: manifest.name,
+    exposeExperimentalAPIs: true
+  }
+}
+
 // The persistent path of "DevTools Extensions" preference file.
 let loadedExtensionsPath = null
 
 app.on('will-quit', function () {
   try {
-    let loadedExtensions = Object.keys(extensionInfoMap).map(function (key) {
-      return extensionInfoMap[key].srcDirectory
+    let loadedExtensions = objectValues(manifestMap).map(function (manifest) {
+      return manifest.srcDirectory
     })
     if (loadedExtensions.length > 0) {
       try {
@@ -82,9 +89,9 @@ app.once('ready', function () {
   try {
     let loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
     if (Array.isArray(loadedExtensions)) {
-      // Preheat the extensionInfo cache.
+      // Preheat the manifest cache.
       for (let srcDirectory of loadedExtensions) {
-        getExtensionInfoFromPath(srcDirectory)
+        getManifestFromPath(srcDirectory)
       }
     }
   } catch (error) {
@@ -109,16 +116,17 @@ app.once('ready', function () {
   })
 
   BrowserWindow.addDevToolsExtension = function (srcDirectory) {
-    let extensionInfo = getExtensionInfoFromPath(srcDirectory)
-    if (extensionInfo) {
+    const manifest = getManifestFromPath(srcDirectory)
+    if (manifest) {
+      const extensionInfo = manifestToExtensionInfo(manifest)
       for (let win of BrowserWindow.getAllWindows()) {
         loadDevToolsExtensions(win, [extensionInfo])
       }
-      return extensionInfo.name
+      return manifest.name
     }
   }
   BrowserWindow.removeDevToolsExtension = function (name) {
-    delete extensionInfoMap[name]
+    delete manifestMap[name]
   }
 
   // Load persisted extensions when devtools is opened.
@@ -126,7 +134,7 @@ app.once('ready', function () {
   BrowserWindow.prototype._init = function () {
     init.call(this)
     this.webContents.on('devtools-opened', () => {
-      loadDevToolsExtensions(this, objectValues(extensionInfoMap))
+      loadDevToolsExtensions(this, objectValues(manifestMap).map(manifestToExtensionInfo))
     })
   }
 })

From edd8210ae5e38cfa023b0bbca50ce40e876a3454 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 18:58:18 +0900
Subject: [PATCH 417/510] Add simple support for background page

---
 lib/browser/chrome-extension.js | 78 +++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 18 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index e882b1862d4e..4626270a8740 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -1,4 +1,4 @@
-const {app, protocol, BrowserWindow} = require('electron')
+const {app, protocol, webContents, BrowserWindow} = require('electron')
 const fs = require('fs')
 const path = require('path')
 const url = require('url')
@@ -28,24 +28,43 @@ let manifestMap = {}
 const getManifestFromPath = function (srcDirectory) {
   let manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
   if (!manifestMap[manifest.name]) {
+    const hostname = generateHostForPath(srcDirectory)
     manifestMap[manifest.name] = manifest
-    // We can not use 'file://' directly because all resources in the extension
-    // will be treated as relative to the root in Chrome.
-    manifest.startPage = url.format({
-      protocol: 'chrome-extension',
-      slashes: true,
-      hostname: generateHostForPath(srcDirectory),
-      pathname: manifest.devtools_page
+    Object.assign(manifest, {
+      srcDirectory: srcDirectory,
+      hostname: hostname,
+      // We can not use 'file://' directly because all resources in the extension
+      // will be treated as relative to the root in Chrome.
+      startPage: url.format({
+        protocol: 'chrome-extension',
+        slashes: true,
+        hostname: hostname,
+        pathname: manifest.devtools_page
+      })
     })
-    manifest.srcDirectory = srcDirectory
     return manifest
   }
 }
 
-// Load the extensions for the window.
-const loadDevToolsExtensions = function (win, extensionInfoArray) {
-  if (!win.devToolsWebContents) return
-  win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)
+// Manage the background pages.
+let backgroundPages = {}
+
+const startBackgroundPages = function (manifest) {
+  if (backgroundPages[manifest.hostname] || !manifest.background) return
+
+  const scripts = manifest.background.scripts.map((name) => {
+    return `<script src="${name}"></script>`
+  }).join('')
+  const html = new Buffer(`<html><body>${scripts}</body></html>`)
+
+  const contents = webContents.create({})
+  backgroundPages[manifest.hostname] = { html: html, contents: contents }
+  contents.loadURL(url.format({
+    protocol: 'chrome-extension',
+    slashes: true,
+    hostname: manifest.hostname,
+    pathname: '_generated_background_page.html'
+  }))
 }
 
 // Transfer the |manifest| to a format that can be recognized by the
@@ -59,6 +78,17 @@ const manifestToExtensionInfo = function (manifest) {
   }
 }
 
+// Load the extensions for the window.
+const loadDevToolsExtensions = function (win, manifests) {
+  if (!win.devToolsWebContents) return
+
+  for (let manifest of manifests) {
+    startBackgroundPages(manifest)
+  }
+  const extensionInfoArray = manifests.map(manifestToExtensionInfo)
+  win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)
+}
+
 // The persistent path of "DevTools Extensions" preference file.
 let loadedExtensionsPath = null
 
@@ -107,9 +137,22 @@ app.once('ready', function () {
     let directory = getPathForHost(parsed.hostname)
     if (!directory) return callback()
 
-    callback(path.join(directory, parsed.path))
+    if (parsed.path === '/_generated_background_page.html' &&
+        backgroundPages[parsed.hostname]) {
+      return callback({
+        mimeType: 'text/html',
+        data: backgroundPages[parsed.hostname].html
+      })
+    }
+
+    fs.readFile(path.join(directory, parsed.path), function (err, content) {
+      if (err)
+        callback(-6)  // FILE_NOT_FOUND
+      else
+        return callback({mimeType: 'text/html', data: content})
+    })
   }
-  protocol.registerFileProtocol('chrome-extension', chromeExtensionHandler, function (error) {
+  protocol.registerBufferProtocol('chrome-extension', chromeExtensionHandler, function (error) {
     if (error) {
       console.error(`Unable to register chrome-extension protocol: ${error}`)
     }
@@ -118,9 +161,8 @@ app.once('ready', function () {
   BrowserWindow.addDevToolsExtension = function (srcDirectory) {
     const manifest = getManifestFromPath(srcDirectory)
     if (manifest) {
-      const extensionInfo = manifestToExtensionInfo(manifest)
       for (let win of BrowserWindow.getAllWindows()) {
-        loadDevToolsExtensions(win, [extensionInfo])
+        loadDevToolsExtensions(win, [manifest])
       }
       return manifest.name
     }
@@ -134,7 +176,7 @@ app.once('ready', function () {
   BrowserWindow.prototype._init = function () {
     init.call(this)
     this.webContents.on('devtools-opened', () => {
-      loadDevToolsExtensions(this, objectValues(manifestMap).map(manifestToExtensionInfo))
+      loadDevToolsExtensions(this, objectValues(manifestMap))
     })
   }
 })

From cdfbe876a57f298cb1b2ce57cc41b942130ddf72 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 26 May 2016 19:29:39 +0900
Subject: [PATCH 418/510] Make sure chrome.devtools.inspectedWindow.tabId is
 set

---
 atom/browser/api/atom_api_web_contents.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 72e87c30a8c7..df46eb883df8 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -655,6 +655,11 @@ void WebContents::DevToolsOpened() {
       isolate(), managed_web_contents()->GetDevToolsWebContents());
   devtools_web_contents_.Reset(isolate(), handle.ToV8());
 
+  // Set inspected tabID.
+  base::FundamentalValue tab_id(ID());
+  managed_web_contents()->CallClientFunction(
+      "DevToolsAPI.setInspectedTabId", &tab_id, nullptr, nullptr);
+
   // Inherit owner window in devtools.
   if (owner_window())
     handle->SetOwnerWindow(managed_web_contents()->GetDevToolsWebContents(),

From 836f8ab33cb85d437e4ec68edb1b7372899fefce Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Thu, 26 May 2016 10:06:42 -0700
Subject: [PATCH 419/510] :bug: Fix setFullscreen() on Windows

This ensures that a BrowserWindow responds to `setFullscreen(true)` if
`full screenable` was not defined during creation.

This bug was on Windows only.
---
 atom/browser/native_window.cc | 5 +++++
 docs/api/browser-window.md    | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 2379bdd053c5..22fcdc173286 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -146,6 +146,11 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   bool fullscreen = false;
   if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen)
     fullscreenable = false;
+  // On Windows, we can only enter fullscreen via API
+  // Ensure that setFullscreen(true) is usable by default
+  #if defined(OS_WIN)
+    fullscreenable = true;
+  #endif
   // Overriden by 'fullscreenable'.
   options.Get(options::kFullScreenable, &fullscreenable);
   SetFullScreenable(fullscreenable);
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 7289057b40eb..b09e254d4d2f 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -59,8 +59,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `fullscreen` Boolean - Whether the window should show in fullscreen. When
     explicity set to `false` the fullscreen button will be hidden or disabled
     on OS X. Default is `false`.
-  * `fullscreenable` Boolean - Whether the maximize/zoom button on OS X should
-    toggle full screen mode or maximize window. Default is `true`.
+  * `fullscreenable` Boolean - Whether the window can be put into fullscreen 
+    mode. On OS X, also whether the maximize/zoom button should toggle full 
+    screen mode or maximize window. Default is `true`.
   * `skipTaskbar` Boolean - Whether to show the window in taskbar. Default is
     `false`.
   * `kiosk` Boolean - The kiosk mode. Default is `false`.

From dc7316f52f8c9175210a20fdc10a087ab5e6d054 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 26 May 2016 14:23:20 -0700
Subject: [PATCH 420/510] Upper case abbreviations

---
 atom/common/api/atom_api_clipboard.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/atom/common/api/atom_api_clipboard.cc b/atom/common/api/atom_api_clipboard.cc
index 1f75f2cd3fe7..b33741687015 100644
--- a/atom/common/api/atom_api_clipboard.cc
+++ b/atom/common/api/atom_api_clipboard.cc
@@ -146,13 +146,19 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   dict.SetMethod("write", &Write);
   dict.SetMethod("readText", &ReadText);
   dict.SetMethod("writeText", &WriteText);
+  dict.SetMethod("readRTF", &ReadRtf);
+  dict.SetMethod("writeRTF", &WriteRtf);
+  dict.SetMethod("readHTML", &ReadHtml);
+  dict.SetMethod("writeHTML", &WriteHtml);
+  dict.SetMethod("readImage", &ReadImage);
+  dict.SetMethod("writeImage", &WriteImage);
+  dict.SetMethod("clear", &Clear);
+
+  // TODO Remove in 2.0, deprecate before then with warnings
   dict.SetMethod("readRtf", &ReadRtf);
   dict.SetMethod("writeRtf", &WriteRtf);
   dict.SetMethod("readHtml", &ReadHtml);
   dict.SetMethod("writeHtml", &WriteHtml);
-  dict.SetMethod("readImage", &ReadImage);
-  dict.SetMethod("writeImage", &WriteImage);
-  dict.SetMethod("clear", &Clear);
 }
 
 }  // namespace

From 71b73a9cfb2427c74f1927029dd46afb847de08a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 26 May 2016 14:23:50 -0700
Subject: [PATCH 421/510] Use new APIs

---
 spec/api-clipboard-spec.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/api-clipboard-spec.js b/spec/api-clipboard-spec.js
index 63f1d907e8a9..344e01452fba 100644
--- a/spec/api-clipboard-spec.js
+++ b/spec/api-clipboard-spec.js
@@ -24,20 +24,20 @@ describe('clipboard module', function () {
     })
   })
 
-  describe('clipboard.readHtml()', function () {
+  describe('clipboard.readHTML()', function () {
     it('returns markup correctly', function () {
       var text = '<string>Hi</string>'
       var markup = process.platform === 'darwin' ? "<meta charset='utf-8'><string>Hi</string>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>'
-      clipboard.writeHtml(text)
-      assert.equal(clipboard.readHtml(), markup)
+      clipboard.writeHTML(text)
+      assert.equal(clipboard.readHTML(), markup)
     })
   })
 
-  describe('clipboard.readRtf', function () {
+  describe('clipboard.readRTF', function () {
     it('returns rtf text correctly', function () {
       var rtf = '{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard\nThis is some {\\b bold} text.\\par\n}'
-      clipboard.writeRtf(rtf)
-      assert.equal(clipboard.readRtf(), rtf)
+      clipboard.writeRTF(rtf)
+      assert.equal(clipboard.readRTF(), rtf)
     })
   })
 
@@ -55,8 +55,8 @@ describe('clipboard module', function () {
         image: p
       })
       assert.equal(clipboard.readText(), text)
-      assert.equal(clipboard.readHtml(), markup)
-      assert.equal(clipboard.readRtf(), rtf)
+      assert.equal(clipboard.readHTML(), markup)
+      assert.equal(clipboard.readRTF(), rtf)
       assert.equal(clipboard.readImage().toDataURL(), i.toDataURL())
     })
   })

From efeb9647ff9413c3ea43ecc4a65d4768d6439038 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 26 May 2016 14:26:12 -0700
Subject: [PATCH 422/510] Update docs for new API names

---
 docs-translations/jp/api/clipboard.md    | 4 ++--
 docs-translations/ko-KR/api/clipboard.md | 8 ++++----
 docs-translations/zh-CN/api/clipboard.md | 8 ++++----
 docs/api/clipboard.md                    | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs-translations/jp/api/clipboard.md b/docs-translations/jp/api/clipboard.md
index 816725395420..88a7fe4c1b4f 100644
--- a/docs-translations/jp/api/clipboard.md
+++ b/docs-translations/jp/api/clipboard.md
@@ -33,13 +33,13 @@ console.log(clipboard.readText('selection'));
 
 プレーンテキストとしてクリップボードに`text`を書き込みます。
 
-### `clipboard.readHtml([type])`
+### `clipboard.readHTML([type])`
 
 * `type` String (optional)
 
 HTMLマークアップとして、クリップボードの内容を返します。
 
-### `clipboard.writeHtml(markup[, type])`
+### `clipboard.writeHTML(markup[, type])`
 
 * `markup` String
 * `type` String (optional)
diff --git a/docs-translations/ko-KR/api/clipboard.md b/docs-translations/ko-KR/api/clipboard.md
index 8b027d2d58e9..48b1b21b57c6 100644
--- a/docs-translations/ko-KR/api/clipboard.md
+++ b/docs-translations/ko-KR/api/clipboard.md
@@ -37,13 +37,13 @@ console.log(clipboard.readText('selection'));
 
 클립보드에 `plain text`로 문자열을 씁니다.
 
-### `clipboard.readHtml([type])`
+### `clipboard.readHTML([type])`
 
 * `type` String (optional)
 
 클립보드 콘텐츠를 `markup`으로 반환합니다.
 
-### `clipboard.writeHtml(markup[, type])`
+### `clipboard.writeHTML(markup[, type])`
 
 * `markup` String
 * `type` String (optional)
@@ -63,13 +63,13 @@ console.log(clipboard.readText('selection'));
 
 클립보드에 `image`를 씁니다.
 
-### `clipboard.readRtf([type])`
+### `clipboard.readRTF([type])`
 
 * `type` String (optional)
 
 클립보드로부터 RTF 형식으로 콘텐츠를 읽어옵니다.
 
-### `clipboard.writeRtf(text[, type])`
+### `clipboard.writeRTF(text[, type])`
 
 * `text` String
 * `type` String (optional)
diff --git a/docs-translations/zh-CN/api/clipboard.md b/docs-translations/zh-CN/api/clipboard.md
index 77aa6d65c0b3..2678bc5a34b9 100644
--- a/docs-translations/zh-CN/api/clipboard.md
+++ b/docs-translations/zh-CN/api/clipboard.md
@@ -34,13 +34,13 @@ console.log(clipboard.readText('selection'));
 
 以纯文本形式向 clipboard 添加内容 .
 
-### `clipboard.readHtml([type])`
+### `clipboard.readHTML([type])`
 
 * `type` String (可选)
 
 返回 clipboard 中的标记内容.
 
-### `clipboard.writeHtml(markup[, type])`
+### `clipboard.writeHTML(markup[, type])`
 
 * `markup` String
 * `type` String (可选)
@@ -60,13 +60,13 @@ console.log(clipboard.readText('selection'));
 
 向 clipboard 中写入 `image` .
 
-### `clipboard.readRtf([type])`
+### `clipboard.readRTF([type])`
 
 * `type` String (可选)
 
 从 clipboard 中返回 RTF 内容. 
 
-### `clipboard.writeRtf(text[, type])`
+### `clipboard.writeRTF(text[, type])`
 
 * `text` String
 * `type` String (可选)
diff --git a/docs/api/clipboard.md b/docs/api/clipboard.md
index 9a8c73043233..c2a16a79b9fb 100644
--- a/docs/api/clipboard.md
+++ b/docs/api/clipboard.md
@@ -36,13 +36,13 @@ Returns the content in the clipboard as plain text.
 
 Writes the `text` into the clipboard as plain text.
 
-### `clipboard.readHtml([type])`
+### `clipboard.readHTML([type])`
 
 * `type` String (optional)
 
 Returns the content in the clipboard as markup.
 
-### `clipboard.writeHtml(markup[, type])`
+### `clipboard.writeHTML(markup[, type])`
 
 * `markup` String
 * `type` String (optional)
@@ -62,13 +62,13 @@ Returns the content in the clipboard as a [NativeImage](native-image.md).
 
 Writes `image` to the clipboard.
 
-### `clipboard.readRtf([type])`
+### `clipboard.readRTF([type])`
 
 * `type` String (optional)
 
 Returns the content in the clipboard as RTF.
 
-### `clipboard.writeRtf(text[, type])`
+### `clipboard.writeRTF(text[, type])`
 
 * `text` String
 * `type` String (optional)

From 23962e133e6ddd69f1c8ea807581e3b4af2f37aa Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 26 May 2016 14:28:33 -0700
Subject: [PATCH 423/510] Use correct TODO format

---
 atom/common/api/atom_api_clipboard.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom/common/api/atom_api_clipboard.cc b/atom/common/api/atom_api_clipboard.cc
index b33741687015..cb413800be77 100644
--- a/atom/common/api/atom_api_clipboard.cc
+++ b/atom/common/api/atom_api_clipboard.cc
@@ -154,7 +154,7 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   dict.SetMethod("writeImage", &WriteImage);
   dict.SetMethod("clear", &Clear);
 
-  // TODO Remove in 2.0, deprecate before then with warnings
+  // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
   dict.SetMethod("readRtf", &ReadRtf);
   dict.SetMethod("writeRtf", &WriteRtf);
   dict.SetMethod("readHtml", &ReadHtml);

From b0c72adbe165eb077299d0313da053961b2814b6 Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Thu, 26 May 2016 17:43:38 -0400
Subject: [PATCH 424/510] :apple: Fix context menus only showing on primary
 monitor.

---
 atom/browser/api/atom_api_menu_mac.mm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index 117e8c0df7ed..3b91dac62a7f 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -52,15 +52,18 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
   // If no preferred item is specified, try to show all of the menu items.
   if (!positioning_item) {
     CGFloat windowBottom = CGRectGetMinY([view window].frame);
-    CGFloat distaceFromBottom = windowBottom + position.y - [menu size].height;
-    if (distaceFromBottom < 0)
-      position.y = position.y - distaceFromBottom + 4;
+    CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
+    CGFloat screenBottom = CGRectGetMinY([view window].screen.frame);
+    CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
+    if (distanceFromBottom < 0)
+      position.y = position.y - distanceFromBottom + 4;
   }
 
   // Place the menu left of cursor if it is overflowing off right of screen.
   CGFloat windowLeft = CGRectGetMinX([view window].frame);
-  CGFloat rightmostPoint = windowLeft + position.x + [menu size].width;
-  if (rightmostPoint > [[NSScreen mainScreen] visibleFrame].size.width)
+  CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
+  CGFloat screenRight = CGRectGetMaxX([view window].screen.frame);
+  if (rightmostMenuPoint > screenRight)
     position.x = position.x - [menu size].width;
 
   // Show the menu.

From b646d7a55c60dc863b6409d512b9a9d1ea1a9115 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 07:43:23 +0900
Subject: [PATCH 425/510] The consts

---
 lib/browser/chrome-extension.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 4626270a8740..aa72552d0f63 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -9,11 +9,11 @@ const objectValues = function (object) {
 }
 
 // Mapping between hostname and file path.
-let hostPathMap = {}
+const hostPathMap = {}
 let hostPathMapNextKey = 0
 
 const generateHostForPath = function (path) {
-  let key = `extension-${++hostPathMapNextKey}`
+  const key = `extension-${++hostPathMapNextKey}`
   hostPathMap[key] = path
   return key
 }
@@ -23,10 +23,10 @@ const getPathForHost = function (host) {
 }
 
 // Cache manifests.
-let manifestMap = {}
+const manifestMap = {}
 
 const getManifestFromPath = function (srcDirectory) {
-  let manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
+  const manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
   if (!manifestMap[manifest.name]) {
     const hostname = generateHostForPath(srcDirectory)
     manifestMap[manifest.name] = manifest
@@ -47,7 +47,7 @@ const getManifestFromPath = function (srcDirectory) {
 }
 
 // Manage the background pages.
-let backgroundPages = {}
+const backgroundPages = {}
 
 const startBackgroundPages = function (manifest) {
   if (backgroundPages[manifest.hostname] || !manifest.background) return
@@ -82,7 +82,7 @@ const manifestToExtensionInfo = function (manifest) {
 const loadDevToolsExtensions = function (win, manifests) {
   if (!win.devToolsWebContents) return
 
-  for (let manifest of manifests) {
+  for (const manifest of manifests) {
     startBackgroundPages(manifest)
   }
   const extensionInfoArray = manifests.map(manifestToExtensionInfo)
@@ -94,7 +94,7 @@ let loadedExtensionsPath = null
 
 app.on('will-quit', function () {
   try {
-    let loadedExtensions = objectValues(manifestMap).map(function (manifest) {
+    const loadedExtensions = objectValues(manifestMap).map(function (manifest) {
       return manifest.srcDirectory
     })
     if (loadedExtensions.length > 0) {
@@ -117,10 +117,10 @@ app.once('ready', function () {
   // Load persisted extensions.
   loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions')
   try {
-    let loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
+    const loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
     if (Array.isArray(loadedExtensions)) {
       // Preheat the manifest cache.
-      for (let srcDirectory of loadedExtensions) {
+      for (const srcDirectory of loadedExtensions) {
         getManifestFromPath(srcDirectory)
       }
     }
@@ -130,11 +130,11 @@ app.once('ready', function () {
 
   // The chrome-extension: can map a extension URL request to real file path.
   const chromeExtensionHandler = function (request, callback) {
-    let parsed = url.parse(request.url)
+    const parsed = url.parse(request.url)
     if (!parsed.hostname || !parsed.path) return callback()
     if (!/extension-\d+/.test(parsed.hostname)) return callback()
 
-    let directory = getPathForHost(parsed.hostname)
+    const directory = getPathForHost(parsed.hostname)
     if (!directory) return callback()
 
     if (parsed.path === '/_generated_background_page.html' &&
@@ -146,10 +146,11 @@ app.once('ready', function () {
     }
 
     fs.readFile(path.join(directory, parsed.path), function (err, content) {
-      if (err)
-        callback(-6)  // FILE_NOT_FOUND
-      else
+      if (err) {
+        return callback(-6)  // FILE_NOT_FOUND
+      } else {
         return callback({mimeType: 'text/html', data: content})
+      }
     })
   }
   protocol.registerBufferProtocol('chrome-extension', chromeExtensionHandler, function (error) {
@@ -161,7 +162,7 @@ app.once('ready', function () {
   BrowserWindow.addDevToolsExtension = function (srcDirectory) {
     const manifest = getManifestFromPath(srcDirectory)
     if (manifest) {
-      for (let win of BrowserWindow.getAllWindows()) {
+      for (const win of BrowserWindow.getAllWindows()) {
         loadDevToolsExtensions(win, [manifest])
       }
       return manifest.name
@@ -172,7 +173,7 @@ app.once('ready', function () {
   }
 
   // Load persisted extensions when devtools is opened.
-  let init = BrowserWindow.prototype._init
+  const init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)
     this.webContents.on('devtools-opened', () => {

From f4c3f0423ab2063f842a375b44efca398c6309e5 Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Thu, 26 May 2016 14:07:19 -0400
Subject: [PATCH 426/510] :gift: Add 'app.releaseSingleInstance()'

---
 atom/browser/api/atom_api_app.cc | 10 +++++++++-
 atom/browser/api/atom_api_app.h  |  1 +
 docs/api/app.md                  |  5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 195cf84a6541..3599e3195fc5 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -401,6 +401,13 @@ bool App::MakeSingleInstance(
   }
 }
 
+void App::ReleaseSingleInstance() {
+  if (process_singleton_.get()) {
+    process_singleton_->Cleanup();
+    process_singleton_.reset();
+  }
+}
+
 #if defined(USE_NSS_CERTS)
 void App::ImportCertificate(
     const base::DictionaryValue& options,
@@ -480,7 +487,8 @@ void App::BuildPrototype(
 #if defined(USE_NSS_CERTS)
       .SetMethod("importCertificate", &App::ImportCertificate)
 #endif
-      .SetMethod("makeSingleInstance", &App::MakeSingleInstance);
+      .SetMethod("makeSingleInstance", &App::MakeSingleInstance)
+      .SetMethod("releaseSingleInstance", &App::ReleaseSingleInstance);
 }
 
 }  // namespace api
diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index 41aef0ac39e7..979f61f0d219 100644
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -108,6 +108,7 @@ class App : public AtomBrowserClient::Delegate,
   void SetDesktopName(const std::string& desktop_name);
   bool MakeSingleInstance(
       const ProcessSingleton::NotificationCallback& callback);
+  void ReleaseSingleInstance();
   std::string GetLocale();
 
 #if defined(USE_NSS_CERTS)
diff --git a/docs/api/app.md b/docs/api/app.md
index ba0accf19825..265f328eb9de 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -496,6 +496,11 @@ app.on('ready', () => {
 });
 ```
 
+### `app.releaseSingleInstance()`
+
+Releases all locks that were created by `makeSingleInstance`. This will allow
+multiple instances of the application to once again run side by side.
+
 ### `app.setUserActivity(type, userInfo[, webpageURL])` _OS X_
 
 * `type` String - Uniquely identifies the activity. Maps to

From 4fb9e20c336a07f5530714afbc375967339f4483 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 08:51:02 +0900
Subject: [PATCH 427/510] Add API to set render process preferences

---
 .../atom_api_render_process_preferences.cc    | 74 +++++++++++++++++++
 .../api/atom_api_render_process_preferences.h | 44 +++++++++++
 atom/browser/render_process_preferences.cc    | 63 ++++++++++++++++
 atom/browser/render_process_preferences.h     | 61 +++++++++++++++
 atom/common/api/api_messages.h                |  3 +
 atom/common/node_bindings.cc                  |  1 +
 atom/renderer/atom_renderer_client.cc         | 24 ++++++
 atom/renderer/atom_renderer_client.h          |  2 +
 atom/renderer/preferences_manager.cc          | 34 +++++++++
 atom/renderer/preferences_manager.h           | 35 +++++++++
 filenames.gypi                                |  6 ++
 11 files changed, 347 insertions(+)
 create mode 100644 atom/browser/api/atom_api_render_process_preferences.cc
 create mode 100644 atom/browser/api/atom_api_render_process_preferences.h
 create mode 100644 atom/browser/render_process_preferences.cc
 create mode 100644 atom/browser/render_process_preferences.h
 create mode 100644 atom/renderer/preferences_manager.cc
 create mode 100644 atom/renderer/preferences_manager.h

diff --git a/atom/browser/api/atom_api_render_process_preferences.cc b/atom/browser/api/atom_api_render_process_preferences.cc
new file mode 100644
index 000000000000..3bdbfaef18e4
--- /dev/null
+++ b/atom/browser/api/atom_api_render_process_preferences.cc
@@ -0,0 +1,74 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/atom_api_render_process_preferences.h"
+
+#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/node_includes.h"
+#include "native_mate/dictionary.h"
+#include "native_mate/object_template_builder.h"
+
+namespace atom {
+
+namespace api {
+
+namespace {
+
+bool IsBrowserWindow(content::RenderProcessHost* process) {
+  return true;
+}
+
+}  // namespace
+
+RenderProcessPreferences::RenderProcessPreferences(
+    v8::Isolate* isolate,
+    const atom::RenderProcessPreferences::Predicate& predicate)
+    : preferences_(predicate) {
+  Init(isolate);
+}
+
+RenderProcessPreferences::~RenderProcessPreferences() {
+}
+
+int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
+  return preferences_.AddEntry(entry);
+}
+
+void RenderProcessPreferences::RemoveEntry(int id) {
+  preferences_.RemoveEntry(id);
+}
+
+// static
+void RenderProcessPreferences::BuildPrototype(
+    v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototype) {
+  mate::ObjectTemplateBuilder(isolate, prototype)
+      .SetMethod("addEntry", &RenderProcessPreferences::AddEntry)
+      .SetMethod("removeEntry", &RenderProcessPreferences::RemoveEntry);
+}
+
+// static
+mate::Handle<RenderProcessPreferences>
+RenderProcessPreferences::ForAllBrowserWindow(v8::Isolate* isolate) {
+  return mate::CreateHandle(
+      isolate,
+      new RenderProcessPreferences(isolate, base::Bind(&IsBrowserWindow)));
+}
+
+}  // namespace api
+
+}  // namespace atom
+
+namespace {
+
+void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context, void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("forAllBrowserWindow",
+                 &atom::api::RenderProcessPreferences::ForAllBrowserWindow);
+}
+
+}  // namespace
+
+NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_render_process_preferences,
+                                  Initialize)
diff --git a/atom/browser/api/atom_api_render_process_preferences.h b/atom/browser/api/atom_api_render_process_preferences.h
new file mode 100644
index 000000000000..a305f1361b2d
--- /dev/null
+++ b/atom/browser/api/atom_api_render_process_preferences.h
@@ -0,0 +1,44 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
+#define ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
+
+#include "atom/browser/render_process_preferences.h"
+#include "native_mate/handle.h"
+#include "native_mate/wrappable.h"
+
+namespace atom {
+
+namespace api {
+
+class RenderProcessPreferences
+    : public mate::Wrappable<RenderProcessPreferences> {
+ public:
+  static mate::Handle<RenderProcessPreferences>
+      ForAllBrowserWindow(v8::Isolate* isolate);
+
+  static void BuildPrototype(v8::Isolate* isolate,
+                             v8::Local<v8::ObjectTemplate> prototype);
+
+  int AddEntry(const base::DictionaryValue& entry);
+  void RemoveEntry(int id);
+
+ protected:
+  RenderProcessPreferences(
+      v8::Isolate* isolate,
+      const atom::RenderProcessPreferences::Predicate& predicate);
+  ~RenderProcessPreferences() override;
+
+ private:
+  atom::RenderProcessPreferences preferences_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderProcessPreferences);
+};
+
+}  // namespace api
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_API_ATOM_API_RENDER_PROCESS_PREFERENCES_H_
diff --git a/atom/browser/render_process_preferences.cc b/atom/browser/render_process_preferences.cc
new file mode 100644
index 000000000000..d109c8714f70
--- /dev/null
+++ b/atom/browser/render_process_preferences.cc
@@ -0,0 +1,63 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/render_process_preferences.h"
+
+#include "atom/common/api/api_messages.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_process_host.h"
+
+namespace atom {
+
+RenderProcessPreferences::RenderProcessPreferences(const Predicate& predicate)
+    : predicate_(predicate),
+      next_id_(0),
+      cache_needs_update_(true) {
+  registrar_.Add(this,
+                 content::NOTIFICATION_RENDERER_PROCESS_CREATED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+}
+
+RenderProcessPreferences::~RenderProcessPreferences() {
+}
+
+int RenderProcessPreferences::AddEntry(const base::DictionaryValue& entry) {
+  int id = ++next_id_;
+  entries_[id] = entry.CreateDeepCopy();
+  cache_needs_update_ = true;
+  return id;
+}
+
+void RenderProcessPreferences::RemoveEntry(int id) {
+  cache_needs_update_ = true;
+  entries_.erase(id);
+}
+
+void RenderProcessPreferences::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  DCHECK_EQ(type, content::NOTIFICATION_RENDERER_PROCESS_CREATED);
+  content::RenderProcessHost* process =
+      content::Source<content::RenderProcessHost>(source).ptr();
+
+  if (!predicate_.Run(process))
+    return;
+
+  UpdateCache();
+  process->Send(new AtomMsg_UpdatePreferences(cached_entries_));
+}
+
+void RenderProcessPreferences::UpdateCache() {
+  if (!cache_needs_update_)
+    return;
+
+  cached_entries_.Clear();
+  for (const auto& iter : entries_)
+    cached_entries_.Append(iter.second->CreateDeepCopy());
+  cache_needs_update_ = false;
+}
+
+}  // namespace atom
diff --git a/atom/browser/render_process_preferences.h b/atom/browser/render_process_preferences.h
new file mode 100644
index 000000000000..77bf176f492c
--- /dev/null
+++ b/atom/browser/render_process_preferences.h
@@ -0,0 +1,61 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_RENDER_PROCESS_PREFERENCES_H_
+#define ATOM_BROWSER_RENDER_PROCESS_PREFERENCES_H_
+
+#include <memory>
+#include <unordered_map>
+
+#include "base/callback.h"
+#include "base/values.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+
+namespace content {
+class RenderProcessHost;
+}
+
+namespace atom {
+
+// Sets user preferences for render processes.
+class RenderProcessPreferences : public content::NotificationObserver {
+ public:
+  using Predicate = base::Callback<bool(content::RenderProcessHost*)>;
+
+  // The |predicate| is used to determine whether to set preferences for a
+  // render process.
+  explicit RenderProcessPreferences(const Predicate& predicate);
+  virtual ~RenderProcessPreferences();
+
+  int AddEntry(const base::DictionaryValue& entry);
+  void RemoveEntry(int id);
+
+ private:
+  // content::NotificationObserver:
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
+
+  void UpdateCache();
+
+  // Manages our notification registrations.
+  content::NotificationRegistrar registrar_;
+
+  Predicate predicate_;
+
+  int next_id_;
+  std::unordered_map<int, std::unique_ptr<base::DictionaryValue>> entries_;
+
+  // We need to convert the |entries_| to ListValue for multiple times, this
+  // caches is only updated when we are sending messages.
+  bool cache_needs_update_;
+  base::ListValue cached_entries_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderProcessPreferences);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_RENDER_PROCESS_PREFERENCES_H_
diff --git a/atom/common/api/api_messages.h b/atom/common/api/api_messages.h
index eeb26614847b..c7ba38de1d33 100644
--- a/atom/common/api/api_messages.h
+++ b/atom/common/api/api_messages.h
@@ -37,3 +37,6 @@ IPC_MESSAGE_ROUTED2(AtomViewMsg_Message,
 // Sent by the renderer when the draggable regions are updated.
 IPC_MESSAGE_ROUTED1(AtomViewHostMsg_UpdateDraggableRegions,
                     std::vector<atom::DraggableRegion> /* regions */)
+
+// Update renderer process preferences.
+IPC_MESSAGE_CONTROL1(AtomMsg_UpdatePreferences, base::ListValue)
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index a55620557e56..ed2ea01675a1 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -42,6 +42,7 @@ REFERENCE_MODULE(atom_browser_power_monitor);
 REFERENCE_MODULE(atom_browser_power_save_blocker);
 REFERENCE_MODULE(atom_browser_protocol);
 REFERENCE_MODULE(atom_browser_global_shortcut);
+REFERENCE_MODULE(atom_browser_render_process_preferences);
 REFERENCE_MODULE(atom_browser_session);
 REFERENCE_MODULE(atom_browser_system_preferences);
 REFERENCE_MODULE(atom_browser_tray);
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 5613f20d2ecc..114fb90555b4 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -11,12 +11,14 @@
 #include "atom/common/api/atom_bindings.h"
 #include "atom/common/api/event_emitter_caller.h"
 #include "atom/common/color_util.h"
+#include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_bindings.h"
 #include "atom/common/node_includes.h"
 #include "atom/common/options_switches.h"
 #include "atom/renderer/atom_render_view_observer.h"
 #include "atom/renderer/guest_view_container.h"
 #include "atom/renderer/node_array_buffer_bridge.h"
+#include "atom/renderer/preferences_manager.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/renderer/media/chrome_key_systems.h"
@@ -29,6 +31,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_message_macros.h"
+#include "native_mate/dictionary.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
@@ -85,6 +88,23 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
   DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
 };
 
+v8::Local<v8::Value> GetRenderProcessPreferences(
+    const PreferencesManager* preferences_manager, v8::Isolate* isolate) {
+  if (preferences_manager->preferences())
+    return mate::ConvertToV8(isolate, *preferences_manager->preferences());
+  else
+    return v8::Null(isolate);
+}
+
+void AddRenderBindings(v8::Isolate* isolate,
+                       v8::Local<v8::Object> process,
+                       const PreferencesManager* preferences_manager) {
+  mate::Dictionary dict(isolate, process);
+  dict.SetMethod(
+      "getRenderProcessPreferences",
+      base::Bind(GetRenderProcessPreferences, preferences_manager));
+}
+
 }  // namespace
 
 AtomRendererClient::AtomRendererClient()
@@ -101,6 +121,8 @@ void AtomRendererClient::RenderThreadStarted() {
 
   OverrideNodeArrayBuffer();
 
+  preferences_manager_.reset(new PreferencesManager);
+
 #if defined(OS_WIN)
   // Set ApplicationUserModelID in renderer process.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -201,6 +223,8 @@ void AtomRendererClient::DidCreateScriptContext(
 
   // Add atom-shell extended APIs.
   atom_bindings_->BindTo(env->isolate(), env->process_object());
+  AddRenderBindings(env->isolate(), env->process_object(),
+                    preferences_manager_.get());
 
   // Load everything.
   node_bindings_->LoadEnvironment(env);
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 16b975fd41f7..78c2e4959943 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -13,6 +13,7 @@
 namespace atom {
 
 class AtomBindings;
+class PreferencesManager;
 class NodeBindings;
 
 class AtomRendererClient : public content::ContentRendererClient {
@@ -61,6 +62,7 @@ class AtomRendererClient : public content::ContentRendererClient {
 
   std::unique_ptr<NodeBindings> node_bindings_;
   std::unique_ptr<AtomBindings> atom_bindings_;
+  std::unique_ptr<PreferencesManager> preferences_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
 };
diff --git a/atom/renderer/preferences_manager.cc b/atom/renderer/preferences_manager.cc
new file mode 100644
index 000000000000..a9ed710a9dbd
--- /dev/null
+++ b/atom/renderer/preferences_manager.cc
@@ -0,0 +1,34 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/renderer/preferences_manager.h"
+
+#include "atom/common/api/api_messages.h"
+#include "content/public/renderer/render_thread.h"
+
+namespace atom {
+
+PreferencesManager::PreferencesManager() {
+  content::RenderThread::Get()->AddObserver(this);
+}
+
+PreferencesManager::~PreferencesManager() {
+}
+
+bool PreferencesManager::OnControlMessageReceived(
+    const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(PreferencesManager, message)
+    IPC_MESSAGE_HANDLER(AtomMsg_UpdatePreferences, OnUpdatePreferences)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+void PreferencesManager::OnUpdatePreferences(
+    const base::ListValue& preferences) {
+  preferences_ = preferences.CreateDeepCopy();
+}
+
+}  // namespace atom
diff --git a/atom/renderer/preferences_manager.h b/atom/renderer/preferences_manager.h
new file mode 100644
index 000000000000..451928085d12
--- /dev/null
+++ b/atom/renderer/preferences_manager.h
@@ -0,0 +1,35 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_RENDERER_PREFERENCES_MANAGER_H_
+#define ATOM_RENDERER_PREFERENCES_MANAGER_H_
+
+#include <memory>
+
+#include "base/values.h"
+#include "content/public/renderer/render_process_observer.h"
+
+namespace atom {
+
+class PreferencesManager : public content::RenderProcessObserver {
+ public:
+  PreferencesManager();
+  ~PreferencesManager() override;
+
+  const base::ListValue* preferences() const { return preferences_.get(); }
+
+ private:
+  // content::RenderThreadObserver:
+  bool OnControlMessageReceived(const IPC::Message& message) override;
+
+  void OnUpdatePreferences(const base::ListValue& preferences);
+
+  std::unique_ptr<base::ListValue> preferences_;
+
+  DISALLOW_COPY_AND_ASSIGN(PreferencesManager);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_RENDERER_PREFERENCES_MANAGER_H_
diff --git a/filenames.gypi b/filenames.gypi
index 14d01270f089..d8e665715109 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -109,6 +109,8 @@
       'atom/browser/api/atom_api_power_monitor.h',
       'atom/browser/api/atom_api_power_save_blocker.cc',
       'atom/browser/api/atom_api_power_save_blocker.h',
+      'atom/browser/api/atom_api_render_process_preferences.cc',
+      'atom/browser/api/atom_api_render_process_preferences.h',
       'atom/browser/api/atom_api_protocol.cc',
       'atom/browser/api/atom_api_protocol.h',
       'atom/browser/api/atom_api_screen.cc',
@@ -220,6 +222,8 @@
       'atom/browser/net/url_request_fetch_job.h',
       'atom/browser/node_debugger.cc',
       'atom/browser/node_debugger.h',
+      'atom/browser/render_process_preferences.cc',
+      'atom/browser/render_process_preferences.h',
       'atom/browser/ui/accelerator_util.cc',
       'atom/browser/ui/accelerator_util.h',
       'atom/browser/ui/accelerator_util_mac.mm',
@@ -396,6 +400,8 @@
       'atom/renderer/guest_view_container.h',
       'atom/renderer/node_array_buffer_bridge.cc',
       'atom/renderer/node_array_buffer_bridge.h',
+      'atom/renderer/preferences_manager.cc',
+      'atom/renderer/preferences_manager.h',
       'atom/utility/atom_content_utility_client.cc',
       'atom/utility/atom_content_utility_client.h',
       'chromium_src/chrome/browser/browser_process.cc',

From 7eab259d92c3c10f440388b725018a4bc367b028 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 09:20:46 +0900
Subject: [PATCH 428/510] Make it possible to only set preferences for
 BrowserWindow

---
 .../atom_api_render_process_preferences.cc    | 14 +++++++++++++
 atom/browser/atom_browser_client.cc           | 20 +++++++++++--------
 atom/browser/atom_browser_client.h            |  3 +++
 atom/browser/web_contents_preferences.h       |  1 +
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/atom/browser/api/atom_api_render_process_preferences.cc b/atom/browser/api/atom_api_render_process_preferences.cc
index 3bdbfaef18e4..59ae07b45c75 100644
--- a/atom/browser/api/atom_api_render_process_preferences.cc
+++ b/atom/browser/api/atom_api_render_process_preferences.cc
@@ -4,8 +4,12 @@
 
 #include "atom/browser/api/atom_api_render_process_preferences.h"
 
+#include "atom/browser/atom_browser_client.h"
+#include "atom/browser/native_window.h"
+#include "atom/browser/window_list.h"
 #include "atom/common/native_mate_converters/value_converter.h"
 #include "atom/common/node_includes.h"
+#include "content/public/browser/render_process_host.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
 
@@ -16,6 +20,16 @@ namespace api {
 namespace {
 
 bool IsBrowserWindow(content::RenderProcessHost* process) {
+  content::WebContents* web_contents =
+      static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())->
+          GetWebContentsFromProcessID(process->GetID());
+  if (!web_contents)
+    return false;
+
+  NativeWindow* window = NativeWindow::FromWebContents(web_contents);
+  if (!window)
+    return false;
+
   return true;
 }
 
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 5a6b49483bcb..e3cb9c5c8c89 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -73,6 +73,17 @@ AtomBrowserClient::AtomBrowserClient() : delegate_(nullptr) {
 AtomBrowserClient::~AtomBrowserClient() {
 }
 
+content::WebContents* AtomBrowserClient::GetWebContentsFromProcessID(
+    int process_id) {
+  // If the process is a pending process, we should use the old one.
+  if (ContainsKey(pending_processes_, process_id))
+    process_id = pending_processes_[process_id];
+
+  // Certain render process will be created with no associated render view,
+  // for example: ServiceWorker.
+  return WebContentsPreferences::GetWebContentsFromProcessID(process_id);
+}
+
 void AtomBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
   int process_id = host->GetID();
@@ -172,14 +183,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
   }
 #endif
 
-  // If the process is a pending process, we should use the old one.
-  if (ContainsKey(pending_processes_, process_id))
-    process_id = pending_processes_[process_id];
-
-  // Certain render process will be created with no associated render view,
-  // for example: ServiceWorker.
-  content::WebContents* web_contents =
-      WebContentsPreferences::GetWebContentsFromProcessID(process_id);
+  content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
   if (!web_contents)
     return;
 
diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h
index 5588f0435afa..cf1a4cc438b6 100644
--- a/atom/browser/atom_browser_client.h
+++ b/atom/browser/atom_browser_client.h
@@ -34,6 +34,9 @@ class AtomBrowserClient : public brightray::BrowserClient,
   using Delegate = content::ContentBrowserClient;
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
+  // Returns the WebContents for pending render processes.
+  content::WebContents* GetWebContentsFromProcessID(int process_id);
+
   // Don't force renderer process to restart for once.
   static void SuppressRendererProcessRestartForOnce();
 
diff --git a/atom/browser/web_contents_preferences.h b/atom/browser/web_contents_preferences.h
index dd98a9658acf..daf1f6e84de5 100644
--- a/atom/browser/web_contents_preferences.h
+++ b/atom/browser/web_contents_preferences.h
@@ -29,6 +29,7 @@ class WebContentsPreferences
     : public content::WebContentsUserData<WebContentsPreferences> {
  public:
   // Get WebContents according to process ID.
+  // FIXME(zcbenz): This method does not belong here.
   static content::WebContents* GetWebContentsFromProcessID(int process_id);
 
   // Append command paramters according to |web_contents|'s preferences.

From a63ff714f8c925fd15aee0879379fecadda50c0c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 09:47:37 +0900
Subject: [PATCH 429/510] Read content_scripts to preferences

---
 lib/browser/chrome-extension.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index aa72552d0f63..1ccc130ebb85 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -1,4 +1,6 @@
 const {app, protocol, webContents, BrowserWindow} = require('electron')
+const renderProcessPreferences = process.atomBinding('render_process_preferences').forAllBrowserWindow()
+
 const fs = require('fs')
 const path = require('path')
 const url = require('url')
@@ -67,6 +69,34 @@ const startBackgroundPages = function (manifest) {
   }))
 }
 
+// Transfer the content scripts to renderer.
+const contentScripts = {}
+
+const injectContentScripts = function (manifest) {
+  if (contentScripts[manifest.name] || !manifest.content_scripts) return
+
+  const readArrayOfFiles = function (relativePath) {
+    return fs.readFileSync(path.join(manifest.srcDirectory, relativePath))
+  }
+
+  const contentScriptToEntry = function (script) {
+    return {
+      matches: script.matches,
+      js: script.js.map(readArrayOfFiles),
+      run_at: script.run_at || 'document_idle'
+    }
+  }
+
+  try {
+    const entry = {
+      contentScripts: manifest.content_scripts.map(contentScriptToEntry)
+    }
+    contentScripts[manifest.name] = renderProcessPreferences.addEntry(entry)
+  } catch (e) {
+    console.error('Failed to read content scripts', e)
+  }
+}
+
 // Transfer the |manifest| to a format that can be recognized by the
 // |DevToolsAPI.addExtensions|.
 const manifestToExtensionInfo = function (manifest) {
@@ -84,6 +114,7 @@ const loadDevToolsExtensions = function (win, manifests) {
 
   for (const manifest of manifests) {
     startBackgroundPages(manifest)
+    injectContentScripts(manifest)
   }
   const extensionInfoArray = manifests.map(manifestToExtensionInfo)
   win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)

From 97c04735a27bf58b5bbe962eddf8babb0842cf25 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 09:55:59 +0900
Subject: [PATCH 430/510] Handle unloading devtools correctly

---
 lib/browser/chrome-extension.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 1ccc130ebb85..f02a1113cc90 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -60,7 +60,7 @@ const startBackgroundPages = function (manifest) {
   const html = new Buffer(`<html><body>${scripts}</body></html>`)
 
   const contents = webContents.create({})
-  backgroundPages[manifest.hostname] = { html: html, contents: contents }
+  backgroundPages[manifest.hostname] = { html: html, webContents: contents }
   contents.loadURL(url.format({
     protocol: 'chrome-extension',
     slashes: true,
@@ -69,6 +69,13 @@ const startBackgroundPages = function (manifest) {
   }))
 }
 
+const removeBackgroundPages = function (manifest) {
+  if (!backgroundPages[manifest.hostname]) return
+
+  backgroundPages[manifest.hostname].webContents.destroy()
+  delete backgroundPages[manifest.hostname]
+}
+
 // Transfer the content scripts to renderer.
 const contentScripts = {}
 
@@ -97,6 +104,13 @@ const injectContentScripts = function (manifest) {
   }
 }
 
+const removeContentScripts = function (manifest) {
+  if (!contentScripts[manifest.name]) return
+
+  renderProcessPreferences.removeEntry(contentScripts[manifest.name])
+  delete contentScripts[manifest.name]
+}
+
 // Transfer the |manifest| to a format that can be recognized by the
 // |DevToolsAPI.addExtensions|.
 const manifestToExtensionInfo = function (manifest) {
@@ -200,6 +214,11 @@ app.once('ready', function () {
     }
   }
   BrowserWindow.removeDevToolsExtension = function (name) {
+    const manifest = manifestMap[name]
+    if (!manifest) return
+
+    removeBackgroundPages(manifest)
+    removeContentScripts(manifest)
     delete manifestMap[name]
   }
 

From 49d9446cce91baaa532443d0282d81e7b3846f77 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 10:29:57 +0900
Subject: [PATCH 431/510] Implement a simple content script injector

---
 filenames.gypi                           |  1 +
 lib/browser/chrome-extension.js          |  2 +-
 lib/renderer/content-scripts-injector.js | 35 ++++++++++++++++++++++++
 lib/renderer/init.js                     |  3 ++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 lib/renderer/content-scripts-injector.js

diff --git a/filenames.gypi b/filenames.gypi
index d8e665715109..ae71164a8ab9 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -49,6 +49,7 @@
       'lib/common/init.js',
       'lib/common/reset-search-paths.js',
       'lib/renderer/chrome-api.js',
+      'lib/renderer/content-scripts-injector.js',
       'lib/renderer/init.js',
       'lib/renderer/inspector.js',
       'lib/renderer/override.js',
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index f02a1113cc90..fbf0fef5b1c1 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -90,7 +90,7 @@ const injectContentScripts = function (manifest) {
     return {
       matches: script.matches,
       js: script.js.map(readArrayOfFiles),
-      run_at: script.run_at || 'document_idle'
+      runAt: script.run_at || 'document_idle'
     }
   }
 
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
new file mode 100644
index 000000000000..0594ada07bfa
--- /dev/null
+++ b/lib/renderer/content-scripts-injector.js
@@ -0,0 +1,35 @@
+const preferences = process.getRenderProcessPreferences()
+if (!preferences || preferences.length == 0) return
+
+const {webFrame} = require('electron')
+
+// Check whether pattern matches.
+// https://developer.chrome.com/extensions/match_patterns
+const matchesPattern = function (pattern) {
+  if (pattern === '<all_urls>')
+    return true
+
+  const regexp = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
+  return location.href.match(regexp)
+}
+
+// Run injected scripts.
+// https://developer.chrome.com/extensions/content_scripts
+const injectContentScript = function (script) {
+  for (const match of script.matches) {
+    if (!matchesPattern(match)) return
+  }
+
+  for (const js of script.js) {
+    if (script.runAt === 'document_start') {
+      webFrame.executeJavaScript(String(js))
+    }
+  }
+}
+
+// Read the renderer process preferences.
+for (const pref of preferences) {
+  if (pref.contentScripts) {
+    pref.contentScripts.forEach(injectContentScript)
+  }
+}
diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index ed0e0e800e62..6138b6ba575b 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -69,6 +69,9 @@ if (window.location.protocol === 'chrome-devtools:') {
   // Override default web functions.
   require('./override')
 
+  // Inject content scripts.
+  require('./content-scripts-injector')
+
   // Load webview tag implementation.
   if (nodeIntegration === 'true' && process.guestInstanceId == null) {
     require('./web-view/web-view')

From 7e1f1591856a5204267b9149976ec40ceb4d3c2e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 11:07:06 +0900
Subject: [PATCH 432/510] Run content scripts at correct phase

---
 atom/renderer/atom_renderer_client.cc    | 17 +++++++++++++++++
 atom/renderer/atom_renderer_client.h     |  1 +
 lib/browser/chrome-extension.js          |  2 +-
 lib/renderer/content-scripts-injector.js | 22 +++++++++++++---------
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 114fb90555b4..4ddbe956b89d 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -186,6 +186,23 @@ void AtomRendererClient::RunScriptsAtDocumentStart(
   // Make sure every page will get a script context created.
   render_frame->GetWebFrame()->executeScript(
       blink::WebScriptSource("void 0"));
+
+  // Inform the docuemnt start pharse.
+  node::Environment* env = node_bindings_->uv_env();
+  if (env) {
+    v8::HandleScope handle_scope(env->isolate());
+    mate::EmitEvent(env->isolate(), env->process_object(), "document-start");
+  }
+}
+
+void AtomRendererClient::RunScriptsAtDocumentEnd(
+    content::RenderFrame* render_frame) {
+  // Inform the docuemnt end pharse.
+  node::Environment* env = node_bindings_->uv_env();
+  if (env) {
+    v8::HandleScope handle_scope(env->isolate());
+    mate::EmitEvent(env->isolate(), env->process_object(), "document-end");
+  }
 }
 
 blink::WebSpeechSynthesizer* AtomRendererClient::OverrideSpeechSynthesizer(
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 78c2e4959943..1a178e01f4fa 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -37,6 +37,7 @@ class AtomRendererClient : public content::ContentRendererClient {
   void RenderFrameCreated(content::RenderFrame*) override;
   void RenderViewCreated(content::RenderView*) override;
   void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
+  void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
   blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
       blink::WebSpeechSynthesizerClient* client) override;
   bool OverrideCreatePlugin(content::RenderFrame* render_frame,
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index fbf0fef5b1c1..9a86e2fc34dc 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -83,7 +83,7 @@ const injectContentScripts = function (manifest) {
   if (contentScripts[manifest.name] || !manifest.content_scripts) return
 
   const readArrayOfFiles = function (relativePath) {
-    return fs.readFileSync(path.join(manifest.srcDirectory, relativePath))
+    return String(fs.readFileSync(path.join(manifest.srcDirectory, relativePath)))
   }
 
   const contentScriptToEntry = function (script) {
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
index 0594ada07bfa..07f330b7cc15 100644
--- a/lib/renderer/content-scripts-injector.js
+++ b/lib/renderer/content-scripts-injector.js
@@ -1,13 +1,9 @@
-const preferences = process.getRenderProcessPreferences()
-if (!preferences || preferences.length == 0) return
-
 const {webFrame} = require('electron')
 
 // Check whether pattern matches.
 // https://developer.chrome.com/extensions/match_patterns
 const matchesPattern = function (pattern) {
-  if (pattern === '<all_urls>')
-    return true
+  if (pattern === '<all_urls>') return true
 
   const regexp = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
   return location.href.match(regexp)
@@ -21,15 +17,23 @@ const injectContentScript = function (script) {
   }
 
   for (const js of script.js) {
+    const fire = () => webFrame.executeJavaScript(js)
     if (script.runAt === 'document_start') {
-      webFrame.executeJavaScript(String(js))
+      process.once('document-start', fire)
+    } else if (script.runAt === 'document_end') {
+      process.once('document-end', fire)
+    } else if (script.runAt === 'document_idle') {
+      document.addEventListener('DOMContentLoaded', fire)
     }
   }
 }
 
 // Read the renderer process preferences.
-for (const pref of preferences) {
-  if (pref.contentScripts) {
-    pref.contentScripts.forEach(injectContentScript)
+const preferences = process.getRenderProcessPreferences()
+if (preferences) {
+  for (const pref of preferences) {
+    if (pref.contentScripts) {
+      pref.contentScripts.forEach(injectContentScript)
+    }
   }
 }

From 134f9019ebd8c3fcd9a5b2459bc16821346a4b0a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 15:10:46 +0900
Subject: [PATCH 433/510] Enable node integration for pages in devtools
 extension

---
 atom/renderer/atom_renderer_client.cc | 39 +++++++++++++++++----------
 atom/renderer/atom_renderer_client.h  |  6 +++--
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 4ddbe956b89d..673ec4aa5d75 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -34,6 +34,7 @@
 #include "native_mate/dictionary.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
+#include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
@@ -62,6 +63,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
   AtomRenderFrameObserver(content::RenderFrame* frame,
                           AtomRendererClient* renderer_client)
       : content::RenderFrameObserver(frame),
+        render_frame_(frame),
         world_id_(-1),
         renderer_client_(renderer_client) {}
 
@@ -72,16 +74,17 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
     if (world_id_ != -1 && world_id_ != world_id)
       return;
     world_id_ = world_id;
-    renderer_client_->DidCreateScriptContext(context);
+    renderer_client_->DidCreateScriptContext(context, render_frame_);
   }
   void WillReleaseScriptContext(v8::Local<v8::Context> context,
                                 int world_id) override {
     if (world_id_ != world_id)
       return;
-    renderer_client_->WillReleaseScriptContext(context);
+    renderer_client_->WillReleaseScriptContext(context, render_frame_);
   }
 
  private:
+  content::RenderFrame* render_frame_;
   int world_id_;
   AtomRendererClient* renderer_client_;
 
@@ -105,6 +108,11 @@ void AddRenderBindings(v8::Isolate* isolate,
       base::Bind(GetRenderProcessPreferences, preferences_manager));
 }
 
+bool IsDevToolsExtension(content::RenderFrame* render_frame) {
+  return static_cast<GURL>(render_frame->GetWebFrame()->document().url())
+      .SchemeIs("chrome-extension");
+}
+
 }  // namespace
 
 AtomRendererClient::AtomRendererClient()
@@ -150,15 +158,11 @@ void AtomRendererClient::RenderThreadStarted() {
 void AtomRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
   new PepperHelper(render_frame);
+  new AtomRenderFrameObserver(render_frame, this);
 
   // Allow file scheme to handle service worker by default.
+  // FIXME(zcbenz): Can this be moved elsewhere?
   blink::WebSecurityPolicy::registerURLSchemeAsAllowingServiceWorkers("file");
-
-  // Only insert node integration for the main frame.
-  if (!render_frame->IsMainFrame())
-    return;
-
-  new AtomRenderFrameObserver(render_frame, this);
 }
 
 void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
@@ -187,7 +191,7 @@ void AtomRendererClient::RunScriptsAtDocumentStart(
   render_frame->GetWebFrame()->executeScript(
       blink::WebScriptSource("void 0"));
 
-  // Inform the docuemnt start pharse.
+  // Inform the document start pharse.
   node::Environment* env = node_bindings_->uv_env();
   if (env) {
     v8::HandleScope handle_scope(env->isolate());
@@ -197,7 +201,7 @@ void AtomRendererClient::RunScriptsAtDocumentStart(
 
 void AtomRendererClient::RunScriptsAtDocumentEnd(
     content::RenderFrame* render_frame) {
-  // Inform the docuemnt end pharse.
+  // Inform the document end pharse.
   node::Environment* env = node_bindings_->uv_env();
   if (env) {
     v8::HandleScope handle_scope(env->isolate());
@@ -225,7 +229,12 @@ bool AtomRendererClient::OverrideCreatePlugin(
 }
 
 void AtomRendererClient::DidCreateScriptContext(
-    v8::Handle<v8::Context> context) {
+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
+  // Only allow node integration for the main frame, unless it is a devtools
+  // extension page.
+  if (!render_frame->IsMainFrame() && !IsDevToolsExtension(render_frame))
+    return;
+
   // Whether the node binding has been initialized.
   bool first_time = node_bindings_->uv_env() == nullptr;
 
@@ -256,9 +265,11 @@ void AtomRendererClient::DidCreateScriptContext(
 }
 
 void AtomRendererClient::WillReleaseScriptContext(
-    v8::Handle<v8::Context> context) {
-  node::Environment* env = node::Environment::GetCurrent(context);
-  mate::EmitEvent(env->isolate(), env->process_object(), "exit");
+    v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
+  if (render_frame->IsMainFrame()) {
+    node::Environment* env = node::Environment::GetCurrent(context);
+    mate::EmitEvent(env->isolate(), env->process_object(), "exit");
+  }
 }
 
 bool AtomRendererClient::ShouldFork(blink::WebLocalFrame* frame,
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 1a178e01f4fa..51872e5bcba9 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -21,8 +21,10 @@ class AtomRendererClient : public content::ContentRendererClient {
   AtomRendererClient();
   virtual ~AtomRendererClient();
 
-  void DidCreateScriptContext(v8::Handle<v8::Context> context);
-  void WillReleaseScriptContext(v8::Handle<v8::Context> context);
+  void DidCreateScriptContext(
+      v8::Handle<v8::Context> context, content::RenderFrame* render_frame);
+  void WillReleaseScriptContext(
+      v8::Handle<v8::Context> context, content::RenderFrame* render_frame);
 
  private:
   enum NodeIntegration {

From c1facec5a601aecdb7ff3af78ffab2f72c349521 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 15:12:49 +0900
Subject: [PATCH 434/510] No need to hijack setInjectedScriptForOrigin

---
 lib/renderer/inspector.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/renderer/inspector.js b/lib/renderer/inspector.js
index aea87f7f2b81..ca60c84d4be9 100644
--- a/lib/renderer/inspector.js
+++ b/lib/renderer/inspector.js
@@ -1,7 +1,4 @@
 window.onload = function () {
-  // Make sure |window.chrome| is defined for devtools extensions.
-  hijackSetInjectedScript(window.InspectorFrontendHost)
-
   // Use menu API to show context menu.
   window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
 
@@ -9,18 +6,6 @@ window.onload = function () {
   window.WebInspector.createFileSelectorElement = createFileSelectorElement
 }
 
-const hijackSetInjectedScript = function (InspectorFrontendHost) {
-  const {setInjectedScriptForOrigin} = InspectorFrontendHost
-  InspectorFrontendHost.setInjectedScriptForOrigin = function (origin, source) {
-    const wrapped = `(function (...args) {
-      window.chrome = {}
-      const original = ${source}
-      original(...args)
-    })`
-    setInjectedScriptForOrigin(origin, wrapped)
-  }
-}
-
 var convertToMenuTemplate = function (items) {
   var fn, i, item, len, template
   template = []

From 9ab76fb8849f583cdda905874e9ff3ee20d5040e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 27 May 2016 16:58:49 +0900
Subject: [PATCH 435/510] Add webContents.sendToAll to send message to all
 frames

---
 atom/browser/api/atom_api_web_contents.cc  |  8 +++-
 atom/browser/api/atom_api_web_contents.h   |  2 +
 atom/common/api/api_messages.h             |  3 +-
 atom/common/api/remote_callback_freer.cc   |  2 +-
 atom/renderer/atom_render_view_observer.cc | 50 ++++++++++++++++------
 atom/renderer/atom_render_view_observer.h  |  3 +-
 lib/browser/api/web-contents.js            |  8 ++++
 7 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index df46eb883df8..b38362972e01 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -1090,7 +1090,12 @@ void WebContents::TabTraverse(bool reverse) {
 
 bool WebContents::SendIPCMessage(const base::string16& channel,
                                  const base::ListValue& args) {
-  return Send(new AtomViewMsg_Message(routing_id(), channel, args));
+  return Send(new AtomViewMsg_Message(routing_id(), false, channel, args));
+}
+
+bool WebContents::SendIPCMessageToAll(const base::string16& channel,
+                                      const base::ListValue& args) {
+  return Send(new AtomViewMsg_Message(routing_id(), true, channel, args));
 }
 
 void WebContents::SendInputEvent(v8::Isolate* isolate,
@@ -1258,6 +1263,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("focus", &WebContents::Focus)
       .SetMethod("tabTraverse", &WebContents::TabTraverse)
       .SetMethod("_send", &WebContents::SendIPCMessage)
+      .SetMethod("_sendToAll", &WebContents::SendIPCMessageToAll)
       .SetMethod("sendInputEvent", &WebContents::SendInputEvent)
       .SetMethod("beginFrameSubscription",
                  &WebContents::BeginFrameSubscription)
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index f3661bedd253..7f90c33ea8f0 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -124,6 +124,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // Send messages to browser.
   bool SendIPCMessage(const base::string16& channel,
                       const base::ListValue& args);
+  bool SendIPCMessageToAll(const base::string16& channel,
+                           const base::ListValue& args);
 
   // Send WebInputEvent to the page.
   void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);
diff --git a/atom/common/api/api_messages.h b/atom/common/api/api_messages.h
index c7ba38de1d33..ab27d5a2516e 100644
--- a/atom/common/api/api_messages.h
+++ b/atom/common/api/api_messages.h
@@ -30,7 +30,8 @@ IPC_SYNC_MESSAGE_ROUTED2_1(AtomViewHostMsg_Message_Sync,
                            base::ListValue /* arguments */,
                            base::string16 /* result (in JSON) */)
 
-IPC_MESSAGE_ROUTED2(AtomViewMsg_Message,
+IPC_MESSAGE_ROUTED3(AtomViewMsg_Message,
+                    bool /* send_to_all */,
                     base::string16 /* channel */,
                     base::ListValue /* arguments */)
 
diff --git a/atom/common/api/remote_callback_freer.cc b/atom/common/api/remote_callback_freer.cc
index 7bc377efc5e7..d1a185d51f39 100644
--- a/atom/common/api/remote_callback_freer.cc
+++ b/atom/common/api/remote_callback_freer.cc
@@ -35,7 +35,7 @@ void RemoteCallbackFreer::RunDestructor() {
       base::ASCIIToUTF16("ELECTRON_RENDERER_RELEASE_CALLBACK");
   base::ListValue args;
   args.AppendInteger(object_id_);
-  Send(new AtomViewMsg_Message(routing_id(), channel, args));
+  Send(new AtomViewMsg_Message(routing_id(), false, channel, args));
 
   Observe(nullptr);
 }
diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc
index bbaea351378b..7ee93efb39b7 100644
--- a/atom/renderer/atom_render_view_observer.cc
+++ b/atom/renderer/atom_render_view_observer.cc
@@ -59,6 +59,34 @@ std::vector<v8::Local<v8::Value>> ListValueToVector(
   return result;
 }
 
+void EmitIPCEvent(blink::WebFrame* frame,
+                  const base::string16& channel,
+                  const base::ListValue& args) {
+  if (!frame || frame->isWebRemoteFrame())
+    return;
+
+  v8::Isolate* isolate = blink::mainThreadIsolate();
+  v8::HandleScope handle_scope(isolate);
+
+  v8::Local<v8::Context> context = frame->mainWorldScriptContext();
+  v8::Context::Scope context_scope(context);
+
+  // Only emit IPC event for context with node integration.
+  node::Environment* env = node::Environment::GetCurrent(context);
+  if (!env)
+    return;
+
+  v8::Local<v8::Object> ipc;
+  if (GetIPCObject(isolate, context, &ipc)) {
+    auto args_vector = ListValueToVector(isolate, args);
+    // Insert the Event object, event.sender is ipc.
+    mate::Dictionary event = mate::Dictionary::CreateEmpty(isolate);
+    event.Set("sender", ipc);
+    args_vector.insert(args_vector.begin(), event.GetHandle());
+    mate::EmitEvent(isolate, ipc, channel, args_vector);
+  }
+}
+
 base::StringPiece NetResourceProvider(int key) {
   if (key == IDR_DIR_HEADER_HTML) {
     base::StringPiece html_data =
@@ -123,7 +151,8 @@ bool AtomRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
+void AtomRenderViewObserver::OnBrowserMessage(bool send_to_all,
+                                              const base::string16& channel,
                                               const base::ListValue& args) {
   if (!document_created_)
     return;
@@ -135,20 +164,13 @@ void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
   if (!frame || frame->isWebRemoteFrame())
     return;
 
-  v8::Isolate* isolate = blink::mainThreadIsolate();
-  v8::HandleScope handle_scope(isolate);
+  EmitIPCEvent(frame, channel, args);
 
-  v8::Local<v8::Context> context = frame->mainWorldScriptContext();
-  v8::Context::Scope context_scope(context);
-
-  v8::Local<v8::Object> ipc;
-  if (GetIPCObject(isolate, context, &ipc)) {
-    auto args_vector = ListValueToVector(isolate, args);
-    // Insert the Event object, event.sender is ipc.
-    mate::Dictionary event = mate::Dictionary::CreateEmpty(isolate);
-    event.Set("sender", ipc);
-    args_vector.insert(args_vector.begin(), event.GetHandle());
-    mate::EmitEvent(isolate, ipc, channel, args_vector);
+  // Also send the message to all sub-frames.
+  if (send_to_all) {
+    for (blink::WebFrame* child = frame->firstChild(); child;
+         child = child->nextSibling())
+      EmitIPCEvent(child, channel, args);
   }
 }
 
diff --git a/atom/renderer/atom_render_view_observer.h b/atom/renderer/atom_render_view_observer.h
index 4b9d59f3fa08..376138f0849a 100644
--- a/atom/renderer/atom_render_view_observer.h
+++ b/atom/renderer/atom_render_view_observer.h
@@ -30,7 +30,8 @@ class AtomRenderViewObserver : public content::RenderViewObserver {
   void DraggableRegionsChanged(blink::WebFrame* frame) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  void OnBrowserMessage(const base::string16& channel,
+  void OnBrowserMessage(bool send_to_all,
+                        const base::string16& channel,
                         const base::ListValue& args);
 
   // Weak reference to renderer client.
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 6253f23b3063..03697199836e 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -78,6 +78,14 @@ let wrapWebContents = function (webContents) {
     return this._send(channel, args)
   }
 
+  // WebContents::sendToAll(channel, args..)
+  webContents.sendToAll = function (channel, ...args) {
+    if (channel == null) {
+      throw new Error('Missing required channel argument')
+    }
+    return this._sendToAll(channel, args)
+  }
+
   // The navigation controller.
   controller = new NavigationController(webContents)
   ref1 = NavigationController.prototype

From 0c710fce336d976647b68e85deb3837fd7a744f4 Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Fri, 27 May 2016 08:56:34 -0400
Subject: [PATCH 436/510] :apple: Fix 'setAspectRatio(0)' not resetting the
 default behaviour.

---
 atom/browser/native_window_mac.mm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index d7f2350e4b04..93368cce510c 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -718,14 +718,11 @@ void NativeWindowMac::SetAspectRatio(double aspect_ratio,
                                      const gfx::Size& extra_size) {
     NativeWindow::SetAspectRatio(aspect_ratio, extra_size);
 
-    // We can't just pass the aspect ratio to Cocoa, since our API receives
-    // it as a float, and Cocoa expects an NSRect with explicit width & height
-    // arguments. Instead we derive those args ourselves from the given aspect
-    // ratio.
-    double width = roundf([window_ frame].size.height * aspect_ratio);
-    double height = roundf(width / aspect_ratio);
-
-    [window_ setAspectRatio:NSMakeSize(width, height)];
+    // Reset the behaviour to default if aspect_ratio is set to 0 or less.
+    if (aspect_ratio > 0.0)
+      [window_ setAspectRatio:NSMakeSize(aspect_ratio, 1.0)];
+    else
+      [window_ setResizeIncrements:NSMakeSize(1.0, 1.0)];
 }
 
 void NativeWindowMac::SetMovable(bool movable) {

From 7cf6be07a613d3d51c5be54e57fb121955ced0d3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 10:41:10 -0700
Subject: [PATCH 437/510] Add failing spec for remote property with no
 prototype

---
 spec/api-ipc-spec.js                 | 6 ++++++
 spec/fixtures/module/no-prototype.js | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 spec/fixtures/module/no-prototype.js

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index 102b23ece567..41cc2488d87e 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -32,6 +32,12 @@ describe('ipc module', function () {
       assert.equal(a.id, 1127)
     })
 
+    it('should work when object has no prototype', function () {
+      var a = remote.require(path.join(fixtures, 'module', 'no-prototype.js'))
+      assert.deepEqual(a.foo, {})
+      assert.equal(a.bar, 1234)
+    })
+
     it('should search module from the user app', function () {
       comparePaths(path.normalize(remote.process.mainModule.filename), path.resolve(__dirname, 'static', 'main.js'))
       comparePaths(path.normalize(remote.process.mainModule.paths[0]), path.resolve(__dirname, 'static', 'node_modules'))
diff --git a/spec/fixtures/module/no-prototype.js b/spec/fixtures/module/no-prototype.js
new file mode 100644
index 000000000000..b6c9d7a4fcda
--- /dev/null
+++ b/spec/fixtures/module/no-prototype.js
@@ -0,0 +1,4 @@
+module.exports = {
+  foo: Object.create(null),
+  bar: 1234
+}

From 59dd7ca9df4fee4d12e7eae57e9046a1935edbc4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 10:46:02 -0700
Subject: [PATCH 438/510] Guard against object with no hasOwnProperty

---
 lib/browser/rpc-server.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index fe264cceeeff..fa9841aeecb0 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -6,6 +6,8 @@ const {ipcMain, isPromise} = electron
 
 const objectsRegistry = require('./objects-registry')
 
+const hasProp = {}.hasOwnProperty
+
 // The internal properties of Function.
 const FUNCTION_PROPERTIES = [
   'length', 'name', 'arguments', 'caller', 'prototype'
@@ -67,7 +69,7 @@ let valueToMeta = function (sender, value, optimizeSimpleObject = false) {
       meta.type = 'date'
     } else if (isPromise(value)) {
       meta.type = 'promise'
-    } else if (value.hasOwnProperty('callee') && value.length != null) {
+    } else if (hasProp.call(value, 'callee') && value.length != null) {
       // Treat the arguments object as array.
       meta.type = 'array'
     } else if (optimizeSimpleObject && v8Util.getHiddenValue(value, 'simple')) {

From fc4b224dec39022ad79eda0e9c7d568f2caa41c2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 10:52:56 -0700
Subject: [PATCH 439/510] Add asserts for properties

---
 spec/api-ipc-spec.js                 | 5 +++--
 spec/fixtures/module/no-prototype.js | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index 41cc2488d87e..22c2edde08d0 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -32,9 +32,10 @@ describe('ipc module', function () {
       assert.equal(a.id, 1127)
     })
 
-    it('should work when object has no prototype', function () {
+    it.only('should work when object has no prototype', function () {
       var a = remote.require(path.join(fixtures, 'module', 'no-prototype.js'))
-      assert.deepEqual(a.foo, {})
+      assert.equal(a.foo.bar, 'baz')
+      assert.equal(a.foo.baz, false)
       assert.equal(a.bar, 1234)
     })
 
diff --git a/spec/fixtures/module/no-prototype.js b/spec/fixtures/module/no-prototype.js
index b6c9d7a4fcda..f298925b80f2 100644
--- a/spec/fixtures/module/no-prototype.js
+++ b/spec/fixtures/module/no-prototype.js
@@ -1,4 +1,4 @@
-module.exports = {
-  foo: Object.create(null),
-  bar: 1234
-}
+const foo = Object.create(null)
+foo.bar = 'baz'
+foo.baz = false
+module.exports = {foo: foo, bar: 1234}

From fa7f0846255a5cb46554f7b12eda55938e1c5c6b Mon Sep 17 00:00:00 2001
From: Felix Rieseberg <felix@felixrieseberg.com>
Date: Thu, 26 May 2016 09:35:26 -0700
Subject: [PATCH 440/510] :fax: Add print() to BrowserWindowProxy

Closes #5685
---
 docs/api/window-open.md  | 4 ++++
 lib/renderer/override.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/docs/api/window-open.md b/docs/api/window-open.md
index 7f9400bfae9f..b615a4b6488e 100644
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -63,6 +63,10 @@ Evaluates the code in the child window.
 
 Focuses the child window (brings the window to front).
 
+### `BrowserWindowProxy.print()`
+
+Invokes the print dialog on the child window.
+
 ### `BrowserWindowProxy.postMessage(message, targetOrigin)`
 
 * `message` String
diff --git a/lib/renderer/override.js b/lib/renderer/override.js
index 35ca80f16afe..4f0b861dc988 100644
--- a/lib/renderer/override.js
+++ b/lib/renderer/override.js
@@ -45,6 +45,10 @@ var BrowserWindowProxy = (function () {
     return ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'blur')
   }
 
+  BrowserWindowProxy.prototype.print = function () {
+    return ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'print')
+  }
+
   Object.defineProperty(BrowserWindowProxy.prototype, 'location', {
     get: function () {
       return ipcRenderer.sendSync('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'getURL')

From 84f6015037263a0e2ce78203587d6ec361089699 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 11:11:55 -0700
Subject: [PATCH 441/510] Call print on webContents

---
 lib/renderer/override.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/override.js b/lib/renderer/override.js
index 4f0b861dc988..5667e5e16f55 100644
--- a/lib/renderer/override.js
+++ b/lib/renderer/override.js
@@ -46,7 +46,7 @@ var BrowserWindowProxy = (function () {
   }
 
   BrowserWindowProxy.prototype.print = function () {
-    return ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'print')
+    return ipcRenderer.send('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, 'print')
   }
 
   Object.defineProperty(BrowserWindowProxy.prototype, 'location', {

From b465f2c3c48ce96cf4d2cc5343428011f232f482 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 13:27:35 -0700
Subject: [PATCH 442/510] Remove duplicate hidden-inset check

---
 atom/browser/native_window_mac.mm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index d7f2350e4b04..4fb60ce5161d 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -490,13 +490,11 @@ NativeWindowMac::NativeWindowMac(
   if (titleBarStyle == "hidden-inset") {
     [window_ setTitlebarAppearsTransparent:YES];
     [window_ setTitleVisibility:NSWindowTitleHidden];
-    if (titleBarStyle == "hidden-inset") {
-      base::scoped_nsobject<NSToolbar> toolbar(
-          [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
-      [toolbar setShowsBaselineSeparator:NO];
-      [window_ setToolbar:toolbar];
-      should_hide_native_toolbar_in_fullscreen_ = true;
-    }
+    base::scoped_nsobject<NSToolbar> toolbar(
+        [[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
+    [toolbar setShowsBaselineSeparator:NO];
+    [window_ setToolbar:toolbar];
+    should_hide_native_toolbar_in_fullscreen_ = true;
   }
 
   // On OS X the initial window size doesn't include window frame.

From 0b27db2ef4d47329c6f3d581313de44c2fd9b91b Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Mon, 23 May 2016 17:39:47 -0700
Subject: [PATCH 443/510] Create guide for how to create your own from-source
 Electron fork

This PR adds the notes on how to use Surf to build and upload a custom version of Electron
---
 docs/development/custom-fork-guide.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 docs/development/custom-fork-guide.md

diff --git a/docs/development/custom-fork-guide.md b/docs/development/custom-fork-guide.md
new file mode 100644
index 000000000000..fd772f2c9361
--- /dev/null
+++ b/docs/development/custom-fork-guide.md
@@ -0,0 +1,27 @@
+## Do I need to do this? Almost certainly not!
+
+Creating a custom fork of Electron is almost certainly not something you will need to do in order to build your app, even for "Production Level" applications. Using a tool such as `electron-packager` or `electron-builder` will allow you to "Rebrand" Electron without having to do these steps.
+
+You need to fork Electron when you have custom C++ code that you have patched directly into Electron, that either cannot be upstreamed, or has been rejected from the official version. As maintainers of Electron, we very much would like to make your scenario work, so please try as hard as you can to get your changes into the official version of Electron, it will be much much easier on you, and we want to help you out!
+
+If you're still convinced, press on to...
+
+## How to create a full custom release for Electron with surf-build
+
+1. Install [Surf](https://github.com/surf-build/surf), via npm: `npm install -g surf-build@latest`
+1. Set the following Environment Variables:
+
+  * `ATOM_SHELL_GITHUB_TOKEN` - a token that can create releases on GitHub
+  * `ATOM_SHELL_S3_ACCESS_KEY`, `ATOM_SHELL_S3_BUCKET`, `ATOM_SHELL_S3_SECRET_KEY` - the place where you'll upload node.js headers as well as symbols
+  * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset and `surf-build` will just do CI-type checks, appropriate to run for every PR.
+  * `CI` - Set to `true` or else we'll fail
+  * `GITHUB_TOKEN` - set it to the same as `ATOM_SHELL_GITHUB_TOKEN`
+  * `SURF_TEMP` - set to `C:\Temp` on Windows or else you'll have MAX_PATH hatin'
+  * `TARGET_ARCH` - set to `ia32` or `x64`  
+
+1. In `script/upload.py`, you _must_ set `ATOM_SHELL_REPO` to your fork, especially if you are a contributor to Electron proper
+
+1. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`
+
+1. Wait a very, very long time.
+

From 153a7f19aed4fac2507d82eb9e816692e622b8f9 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Mon, 23 May 2016 19:22:59 -0700
Subject: [PATCH 444/510] Add notes on S3 directory structure

---
 docs/development/custom-fork-guide.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/development/custom-fork-guide.md b/docs/development/custom-fork-guide.md
index fd772f2c9361..f6e725bfb975 100644
--- a/docs/development/custom-fork-guide.md
+++ b/docs/development/custom-fork-guide.md
@@ -9,6 +9,15 @@ If you're still convinced, press on to...
 ## How to create a full custom release for Electron with surf-build
 
 1. Install [Surf](https://github.com/surf-build/surf), via npm: `npm install -g surf-build@latest`
+
+1. Create a new S3 bucket and create the following empty directory structure:
+
+```
+- atom-shell
+  - symbols
+  - dist
+```
+
 1. Set the following Environment Variables:
 
   * `ATOM_SHELL_GITHUB_TOKEN` - a token that can create releases on GitHub

From 4734cbaf1cc4ada09501b13e7881c47afa1835c2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:00:04 -0700
Subject: [PATCH 445/510] Move custom fork content to app distribution doc

---
 docs/development/custom-fork-guide.md     | 36 -----------------
 docs/tutorial/application-distribution.md | 47 +++++++++++++++++++++++
 2 files changed, 47 insertions(+), 36 deletions(-)
 delete mode 100644 docs/development/custom-fork-guide.md

diff --git a/docs/development/custom-fork-guide.md b/docs/development/custom-fork-guide.md
deleted file mode 100644
index f6e725bfb975..000000000000
--- a/docs/development/custom-fork-guide.md
+++ /dev/null
@@ -1,36 +0,0 @@
-## Do I need to do this? Almost certainly not!
-
-Creating a custom fork of Electron is almost certainly not something you will need to do in order to build your app, even for "Production Level" applications. Using a tool such as `electron-packager` or `electron-builder` will allow you to "Rebrand" Electron without having to do these steps.
-
-You need to fork Electron when you have custom C++ code that you have patched directly into Electron, that either cannot be upstreamed, or has been rejected from the official version. As maintainers of Electron, we very much would like to make your scenario work, so please try as hard as you can to get your changes into the official version of Electron, it will be much much easier on you, and we want to help you out!
-
-If you're still convinced, press on to...
-
-## How to create a full custom release for Electron with surf-build
-
-1. Install [Surf](https://github.com/surf-build/surf), via npm: `npm install -g surf-build@latest`
-
-1. Create a new S3 bucket and create the following empty directory structure:
-
-```
-- atom-shell
-  - symbols
-  - dist
-```
-
-1. Set the following Environment Variables:
-
-  * `ATOM_SHELL_GITHUB_TOKEN` - a token that can create releases on GitHub
-  * `ATOM_SHELL_S3_ACCESS_KEY`, `ATOM_SHELL_S3_BUCKET`, `ATOM_SHELL_S3_SECRET_KEY` - the place where you'll upload node.js headers as well as symbols
-  * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset and `surf-build` will just do CI-type checks, appropriate to run for every PR.
-  * `CI` - Set to `true` or else we'll fail
-  * `GITHUB_TOKEN` - set it to the same as `ATOM_SHELL_GITHUB_TOKEN`
-  * `SURF_TEMP` - set to `C:\Temp` on Windows or else you'll have MAX_PATH hatin'
-  * `TARGET_ARCH` - set to `ia32` or `x64`  
-
-1. In `script/upload.py`, you _must_ set `ATOM_SHELL_REPO` to your fork, especially if you are a contributor to Electron proper
-
-1. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`
-
-1. Wait a very, very long time.
-
diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index a5d0f3797c83..056530da124b 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -125,3 +125,50 @@ packaging tools to do the work for you:
 
 * [electron-packager](https://github.com/maxogden/electron-packager)
 * [electron-builder](https://github.com/loopline-systems/electron-builder)
+
+### Creating a Custom Electron Fork
+
+Creating a custom fork of Electron is almost certainly not something you will
+need to do in order to build your app, even for "Production Level" applications.
+Using a tool such as `electron-packager` or `electron-builder` will allow you to
+"Rebrand" Electron without having to do these steps.
+
+You need to fork Electron when you have custom C++ code that you have patched
+directly into Electron, that either cannot be upstreamed, or has been rejected
+from the official version. As maintainers of Electron, we very much would like
+to make your scenario work, so please try as hard as you can to get your changes
+into the official version of Electron, it will be much much easier on you, and
+we want to help you out!
+
+#### Creating a Full Custom Electron Release with surf-build
+
+1. Install [Surf](https://github.com/surf-build/surf), via npm:
+  `npm install -g surf-build@latest`
+
+1. Create a new S3 bucket and create the following empty directory structure:
+
+```
+- atom-shell
+  - symbols
+  - dist
+```
+
+1. Set the following Environment Variables:
+
+  * `ATOM_SHELL_GITHUB_TOKEN` - a token that can create releases on GitHub
+  * `ATOM_SHELL_S3_ACCESS_KEY`, `ATOM_SHELL_S3_BUCKET`, `ATOM_SHELL_S3_SECRET_KEY`
+    - the place where you'll upload node.js headers as well as symbols
+  * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
+    and `surf-build` will just do CI-type checks, appropriate to run for every
+    pull request.
+  * `CI` - Set to `true` or else we'll fail
+  * `GITHUB_TOKEN` - set it to the same as `ATOM_SHELL_GITHUB_TOKEN`
+  * `SURF_TEMP` - set to `C:\Temp` on Windows to prevent path too long issues
+  * `TARGET_ARCH` - set to `ia32` or `x64`  
+
+1. In `script/upload.py`, you _must_ set `ATOM_SHELL_REPO` to your fork,
+  especially if you are a contributor to Electron proper.
+
+1. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`
+
+1. Wait a very, very long time.

From 556b39c6f24d929ba0952e69a87a4720a1f223bb Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:00:26 -0700
Subject: [PATCH 446/510] ATOM_SHELL -> ELECTRON in env vars

---
 docs/tutorial/application-distribution.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index 056530da124b..a05447b87c05 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -155,18 +155,18 @@ we want to help you out!
 
 1. Set the following Environment Variables:
 
-  * `ATOM_SHELL_GITHUB_TOKEN` - a token that can create releases on GitHub
-  * `ATOM_SHELL_S3_ACCESS_KEY`, `ATOM_SHELL_S3_BUCKET`, `ATOM_SHELL_S3_SECRET_KEY`
+  * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
+  * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY`
     - the place where you'll upload node.js headers as well as symbols
   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
     and `surf-build` will just do CI-type checks, appropriate to run for every
     pull request.
   * `CI` - Set to `true` or else we'll fail
-  * `GITHUB_TOKEN` - set it to the same as `ATOM_SHELL_GITHUB_TOKEN`
+  * `GITHUB_TOKEN` - set it to the same as `ELECTRON_GITHUB_TOKEN`
   * `SURF_TEMP` - set to `C:\Temp` on Windows to prevent path too long issues
   * `TARGET_ARCH` - set to `ia32` or `x64`  
 
-1. In `script/upload.py`, you _must_ set `ATOM_SHELL_REPO` to your fork,
+1. In `script/upload.py`, you _must_ set `ELECTRON_REPO` to your fork,
   especially if you are a contributor to Electron proper.
 
 1. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`

From f17e64e7269ba2c9789bf2b0a5b7ba80c5139ed8 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:01:38 -0700
Subject: [PATCH 447/510] Tweak fork section

---
 docs/tutorial/application-distribution.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index a05447b87c05..bf6e1e837e71 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -138,14 +138,14 @@ directly into Electron, that either cannot be upstreamed, or has been rejected
 from the official version. As maintainers of Electron, we very much would like
 to make your scenario work, so please try as hard as you can to get your changes
 into the official version of Electron, it will be much much easier on you, and
-we want to help you out!
+we appreciate your help.
 
 #### Creating a Full Custom Electron Release with surf-build
 
 1. Install [Surf](https://github.com/surf-build/surf), via npm:
   `npm install -g surf-build@latest`
 
-1. Create a new S3 bucket and create the following empty directory structure:
+2. Create a new S3 bucket and create the following empty directory structure:
 
 ```
 - atom-shell
@@ -153,7 +153,7 @@ we want to help you out!
   - dist
 ```
 
-1. Set the following Environment Variables:
+3. Set the following Environment Variables:
 
   * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
   * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY`
@@ -166,9 +166,9 @@ we want to help you out!
   * `SURF_TEMP` - set to `C:\Temp` on Windows to prevent path too long issues
   * `TARGET_ARCH` - set to `ia32` or `x64`  
 
-1. In `script/upload.py`, you _must_ set `ELECTRON_REPO` to your fork,
+4. In `script/upload.py`, you _must_ set `ELECTRON_REPO` to your fork,
   especially if you are a contributor to Electron proper.
 
-1. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`
+5. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`
 
-1. Wait a very, very long time.
+6. Wait a very, very long time for the build to complete.

From 2effa32e3eab556e1e0aec274bb3e2fa4d8cf94e Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:02:22 -0700
Subject: [PATCH 448/510] Tighten up section title

---
 docs/tutorial/application-distribution.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index bf6e1e837e71..cd5fe47dec99 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -140,7 +140,7 @@ to make your scenario work, so please try as hard as you can to get your changes
 into the official version of Electron, it will be much much easier on you, and
 we appreciate your help.
 
-#### Creating a Full Custom Electron Release with surf-build
+#### Creating a Custom Release with surf-build
 
 1. Install [Surf](https://github.com/surf-build/surf), via npm:
   `npm install -g surf-build@latest`

From 1e28e3fc27eb3afbe3db0561a51f24b998902cd7 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:04:04 -0700
Subject: [PATCH 449/510] Add trailing slashes to directories

---
 docs/tutorial/application-distribution.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index cd5fe47dec99..bc2cdaefe8b4 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -148,9 +148,9 @@ we appreciate your help.
 2. Create a new S3 bucket and create the following empty directory structure:
 
 ```
-- atom-shell
-  - symbols
-  - dist
+- atom-shell/
+  - symbols/
+  - dist/
 ```
 
 3. Set the following Environment Variables:

From 82bc98ec3cb977453e57cd5c24acbd0ec52b7676 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:05:01 -0700
Subject: [PATCH 450/510] Put - at end of previous line

---
 docs/tutorial/application-distribution.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index bc2cdaefe8b4..7f6610a5480a 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -156,8 +156,8 @@ we appreciate your help.
 3. Set the following Environment Variables:
 
   * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
-  * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY`
-    - the place where you'll upload node.js headers as well as symbols
+  * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY` -
+    the place where you'll upload node.js headers as well as symbols
   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
     and `surf-build` will just do CI-type checks, appropriate to run for every
     pull request.

From ba6c8b531fcb2d5eecb52514fc17bef4dada367e Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:06:40 -0700
Subject: [PATCH 451/510] Add ELECTRON_REPO example

---
 docs/tutorial/application-distribution.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index 7f6610a5480a..9db4b0f8c460 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -166,7 +166,7 @@ we appreciate your help.
   * `SURF_TEMP` - set to `C:\Temp` on Windows to prevent path too long issues
   * `TARGET_ARCH` - set to `ia32` or `x64`  
 
-4. In `script/upload.py`, you _must_ set `ELECTRON_REPO` to your fork,
+4. In `script/upload.py`, you _must_ set `ELECTRON_REPO` to your fork (`MYORG/electron`),
   especially if you are a contributor to Electron proper.
 
 5. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`

From 6add7f8d498d44a12d8251f1c308fca6f1e89d65 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 14:34:23 -0700
Subject: [PATCH 452/510] we -> it

---
 docs/tutorial/application-distribution.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index 9db4b0f8c460..c8ec1f6d09b6 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -161,7 +161,7 @@ we appreciate your help.
   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
     and `surf-build` will just do CI-type checks, appropriate to run for every
     pull request.
-  * `CI` - Set to `true` or else we'll fail
+  * `CI` - Set to `true` or else it will fail
   * `GITHUB_TOKEN` - set it to the same as `ELECTRON_GITHUB_TOKEN`
   * `SURF_TEMP` - set to `C:\Temp` on Windows to prevent path too long issues
   * `TARGET_ARCH` - set to `ia32` or `x64`  

From 1704b1ad53fb2fa4d0318847ef1182186906787a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 27 May 2016 11:30:47 -0700
Subject: [PATCH 453/510] Remove APIs that are no longer present

---
 docs-translations/ko-KR/api/browser-window.md |  8 --------
 docs-translations/pt-BR/api/browser-window.md | 14 ++------------
 docs-translations/zh-CN/api/browser-window.md | 10 +---------
 docs/api/browser-window.md                    |  8 --------
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/docs-translations/ko-KR/api/browser-window.md b/docs-translations/ko-KR/api/browser-window.md
index ee77a9bbd439..ff2e7fa72d4c 100644
--- a/docs-translations/ko-KR/api/browser-window.md
+++ b/docs-translations/ko-KR/api/browser-window.md
@@ -778,14 +778,6 @@ Windows 메시지 훅을 등록합니다. `callback`은 WndProc에서 메시지
 `callback(image)` 형식으로 호출됩니다. `image`는 [NativeImage](native-image.md)의
 인스턴스이며 스크린샷 데이터를 담고있습니다. `rect`를 생략하면 페이지 전체를 캡처합니다.
 
-### `win.print([options])`
-
-`webContents.print([options])` API와 같습니다.
-
-### `win.printToPDF(options, callback)`
-
-`webContents.printToPDF(options, callback)` API와 같습니다.
-
 ### `win.loadURL(url[, options])`
 
 `webContents.loadURL(url[, options])` API와 같습니다.
diff --git a/docs-translations/pt-BR/api/browser-window.md b/docs-translations/pt-BR/api/browser-window.md
index 143b6368bc1e..5ebfa6637725 100644
--- a/docs-translations/pt-BR/api/browser-window.md
+++ b/docs-translations/pt-BR/api/browser-window.md
@@ -112,10 +112,10 @@ Normalmente você utiliza o manipulador de eventos do `beforeunload` para decidi
 window.onbeforeunload = function(e) {
   console.log('Não quero ser fechada');
 
-  // Diferente de navegadores comuns, nos quais uma string deve ser retornada e 
+  // Diferente de navegadores comuns, nos quais uma string deve ser retornada e
   // o usuário deve confirmar se a janela será fechada, o Electron dá mais opções
   // aos desenvolvedores. Retornar uma string vazia ou false cancela o fechamento.
-  // Você também pode usar a API de diálogo para deixar que o usuário confirme o 
+  // Você também pode usar a API de diálogo para deixar que o usuário confirme o
   // fechamento do aplicativo.
   e.returnValue = false;
 };
@@ -528,14 +528,6 @@ Retorna um boolean indicando se o documento da janela foi editado.
 
 Captura uma imagem da página dentro do `rect`. Após completar, `callback` será chamada com `callback(imagem)`. `imagem` é uma instância de [NativeImage](../../../docs/api/native-image.md) que guarda dados sobre a imagem. Omitir `rect` captura toda a página visível.
 
-### `win.print([options])`
-
-Igual a `webContents.print([options])`
-
-### `win.printToPDF(options, callback)`
-
-Igual a `webContents.printToPDF(options, callback)`
-
 ### `win.loadURL(url[, options])`
 
 Igual a `webContents.loadURL(url[, options])`.
@@ -628,5 +620,3 @@ Define se a janela deve estar visível em todos os *workspaces*.
 Retorna um boolean indicando se a janela está visível em todos os *workspaces*.
 
 **Nota:** Esta API sempre retorna `false` no Windows.
-
-
diff --git a/docs-translations/zh-CN/api/browser-window.md b/docs-translations/zh-CN/api/browser-window.md
index aedc5f06a2c9..867cd3e9b422 100644
--- a/docs-translations/zh-CN/api/browser-window.md
+++ b/docs-translations/zh-CN/api/browser-window.md
@@ -636,14 +636,6 @@ windows上句柄类型为 `HWND` ，OS X `NSView*` ， Linux `Window`.
 
 捕获 `rect` 中的page 的快照.完成后将调用回调函数 `callback` 并返回 `image` . `image` 是存储了快照信息的[NativeImage](native-image.md)实例.如果不设置 `rect` 则将捕获所有可见page.
 
-### `win.print([options])`
-
-类似 `webContents.print([options])`
-
-### `win.printToPDF(options, callback)`
-
-类似 `webContents.printToPDF(options, callback)`
-
 ### `win.loadURL(url[, options])`
 
 类似 `webContents.loadURL(url[, options])`.
@@ -671,7 +663,7 @@ windows上句柄类型为 `HWND` ，OS X `NSView*` ， Linux `Window`.
 
 ### `win.setOverlayIcon(overlay, description)` _Windows 7+_
 
-* `overlay` [NativeImage](native-image.md) - 在底部任务栏右边显示图标. 
+* `overlay` [NativeImage](native-image.md) - 在底部任务栏右边显示图标.
 * `description` String - 描述.
 
 向当前任务栏添加一个 16 x 16 像素的图标，通常用来覆盖一些应用的状态，或者直接来提示用户.
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index fcb57056a7af..1bba4d079442 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -787,14 +787,6 @@ be called with `callback(image)`. The `image` is an instance of
 [NativeImage](native-image.md) that stores data of the snapshot. Omitting
 `rect` will capture the whole visible page.
 
-### `win.print([options])`
-
-Same as `webContents.print([options])`
-
-### `win.printToPDF(options, callback)`
-
-Same as `webContents.printToPDF(options, callback)`
-
 ### `win.loadURL(url[, options])`
 
 Same as `webContents.loadURL(url[, options])`.

From 0a03dcd481a045ff775c0a737242e76af45034fa Mon Sep 17 00:00:00 2001
From: Aaron Ang <awz.ang@gmail.com>
Date: Sat, 28 May 2016 00:22:47 +0200
Subject: [PATCH 454/510] :memo: Indicate directories in the Structure of
 Source Code section

[ci skip]
---
 .../source-code-directory-structure.md        | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/development/source-code-directory-structure.md b/docs/development/source-code-directory-structure.md
index 9e3cfee0b031..cc74fe69427a 100644
--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -11,38 +11,38 @@ to understand the source code better.
 
 ```
 Electron
-├── atom - C++ source code.
-|   ├── app - System entry code.
-|   ├── browser - The frontend including the main window, UI, and all of the
+├── atom/ - C++ source code.
+|   ├── app/ - System entry code.
+|   ├── browser/ - The frontend including the main window, UI, and all of the
 |   |   main process things. This talks to the renderer to manage web pages.
-|   |   ├── ui - Implementation of UI stuff for different platforms.
-|   |   |   ├── cocoa - Cocoa specific source code.
-|   |   |   ├── gtk - GTK+ specific source code.
-|   |   |   └── win - Windows GUI specific source code.
-|   |   ├── api - The implementation of the main process APIs.
-|   |   ├── net - Network related code.
-|   |   ├── mac - Mac specific Objective-C source code.
-|   |   └── resources - Icons, platform-dependent files, etc.
-|   ├── renderer - Code that runs in renderer process.
-|   |   └── api - The implementation of renderer process APIs.
-|   └── common - Code that used by both the main and renderer processes,
+|   |   ├── ui/ - Implementation of UI stuff for different platforms.
+|   |   |   ├── cocoa/ - Cocoa specific source code.
+|   |   |   ├── win/ - Windows GUI specific source code.
+|   |   |   └── x/ - X11 specific source code.
+|   |   ├── api/ - The implementation of the main process APIs.
+|   |   ├── net/ - Network related code.
+|   |   ├── mac/ - Mac specific Objective-C source code.
+|   |   └── resources/ - Icons, platform-dependent files, etc.
+|   ├── renderer/ - Code that runs in renderer process.
+|   |   └── api/ - The implementation of renderer process APIs.
+|   └── common/ - Code that used by both the main and renderer processes,
 |       including some utility functions and code to integrate node's message
 |       loop into Chromium's message loop.
-|       └── api - The implementation of common APIs, and foundations of
+|       └── api/ - The implementation of common APIs, and foundations of
 |           Electron's built-in modules.
-├── chromium_src - Source code that copied from Chromium.
-├── default_app - The default page to show when Electron is started without
+├── chromium_src/ - Source code that copied from Chromium.
+├── default_app/ - The default page to show when Electron is started without
 |   providing an app.
-├── docs - Documentations.
-├── lib - JavaScript source code.
-|   ├── browser - Javascript main process initialization code.
-|   |   └── api - Javascript API implementation.
-|   ├── common - JavaScript used by both the main and renderer processes
-|   |   └── api - Javascript API implementation.
-|   └── renderer - Javascript renderer process initialization code.
-|       └── api - Javascript API implementation.
-├── spec - Automatic tests.
-├── atom.gyp - Building rules of Electron.
+├── docs/ - Documentations.
+├── lib/ - JavaScript source code.
+|   ├── browser/ - Javascript main process initialization code.
+|   |   └── api/ - Javascript API implementation.
+|   ├── common/ - JavaScript used by both the main and renderer processes
+|   |   └── api/ - Javascript API implementation.
+|   └── renderer/ - Javascript renderer process initialization code.
+|       └── api/ - Javascript API implementation.
+├── spec/ - Automatic tests.
+├── electron.gyp - Building rules of Electron.
 └── common.gypi - Compiler specific settings and building rules for other
     components like `node` and `breakpad`.
 ```

From dfe7ae21249b02bbeee00501813ddca3c9e094a0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 10:10:24 +0900
Subject: [PATCH 455/510] Add webContents.fromId

---
 atom/browser/api/atom_api_web_contents.cc |  2 ++
 lib/browser/api/web-contents.js           | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index b38362972e01..9f447f8e34e4 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -1344,6 +1344,8 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
   mate::Dictionary dict(isolate, exports);
   dict.SetMethod("create", &atom::api::WebContents::Create);
   dict.SetMethod("_setWrapWebContents", &atom::api::SetWrapWebContents);
+  dict.SetMethod("fromId",
+                 &mate::TrackableObject<atom::api::WebContents>::FromWeakMapID);
 }
 
 }  // namespace
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 03697199836e..1b601f095dbb 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -226,9 +226,12 @@ binding._setWrapWebContents(wrapWebContents)
 debuggerBinding._setWrapDebugger(wrapDebugger)
 sessionBinding._setWrapSession(wrapSession)
 
-module.exports.create = function (options) {
-  if (options == null) {
-    options = {}
+module.exports = {
+  create (options = {}) {
+    return binding.create(options)
+  },
+
+  fromId (id) {
+    return binding.fromId(id)
   }
-  return binding.create(options)
 }

From e76c36a9a86f2b2e866f795294328c1fdc637821 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 10:26:41 +0900
Subject: [PATCH 456/510] Make simple runtime.connect work

---
 lib/browser/chrome-extension.js | 25 +++++++++-
 lib/renderer/chrome-api.js      | 86 ++++++++++++++++++++++++++++++++-
 2 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 9a86e2fc34dc..b0045294f38e 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -1,4 +1,4 @@
-const {app, protocol, webContents, BrowserWindow} = require('electron')
+const {app, ipcMain, protocol, webContents, BrowserWindow} = require('electron')
 const renderProcessPreferences = process.atomBinding('render_process_preferences').forAllBrowserWindow()
 
 const fs = require('fs')
@@ -67,6 +67,7 @@ const startBackgroundPages = function (manifest) {
     hostname: manifest.hostname,
     pathname: '_generated_background_page.html'
   }))
+  contents.openDevTools()
 }
 
 const removeBackgroundPages = function (manifest) {
@@ -76,6 +77,28 @@ const removeBackgroundPages = function (manifest) {
   delete backgroundPages[manifest.hostname]
 }
 
+// Handle the chrome.* API messages.
+ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, hostname, connectInfo) {
+  const page = backgroundPages[hostname]
+  if (!page) {
+    console.error(`Connect to unkown extension ${hostname}`)
+    return
+  }
+
+  event.returnValue = page.webContents.id
+  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, hostname, connectInfo)
+})
+
+ipcMain.on('CHROME_PORT_POSTMESSAGE', function (event, webContentsId, hostname, message) {
+  const contents = webContents.fromId(webContentsId)
+  if (!contents) {
+    console.error(`Sending message to extension ${hostname} with unkown webContentsId ${webContentsId}`)
+    return
+  }
+
+  contents.sendToAll(`CHROME_PORT_ONMESSAGE_${hostname}`, message)
+})
+
 // Transfer the content scripts to renderer.
 const contentScripts = {}
 
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 719066a6fae7..84577a7c7941 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -1,4 +1,68 @@
+const {ipcRenderer} = require('electron')
 const url = require('url')
+
+// TODO(zcbenz): Set it to correct value for content scripts.
+const currentExtensionId = window.location.hostname
+
+class Event {
+  constructor () {
+    this.listeners = []
+  }
+
+  addListener (callback) {
+    this.listeners.push(callback)
+  }
+
+  emit (...args) {
+    for (const listener of this.listeners) {
+      listener(...args)
+    }
+  }
+}
+
+class OnConnect extends Event {
+  constructor () {
+    super()
+
+    ipcRenderer.on('CHROME_RUNTIME_ONCONNECT', (event, webContentsId, extensionId, connectInfo) => {
+      this.emit(new Port(webContentsId, extensionId, connectInfo.name))
+    })
+  }
+}
+
+class MessageSender {
+  constructor () {
+    this.tab = null
+    this.frameId = null
+    this.id = null
+    this.url = null
+    this.tlsChannelId = null
+  }
+}
+
+class Port {
+  constructor (webContentsId, extensionId, name) {
+    this.webContentsId = webContentsId
+    this.extensionId = extensionId
+
+    this.name = name
+    this.onDisconnect = new Event()
+    this.onMessage = new Event()
+    this.sender = new MessageSender()
+
+    ipcRenderer.on(`CHROME_PORT_ONMESSAGE_${extensionId}`, (event, message) => {
+      this.onMessage.emit(message, new MessageSender(), function () {})
+    })
+  }
+
+  disconnect () {
+  }
+
+  postMessage (message) {
+    ipcRenderer.send('CHROME_PORT_POSTMESSAGE', this.webContentsId, this.extensionId, message)
+  }
+}
+
 const chrome = window.chrome = window.chrome || {}
 
 chrome.extension = {
@@ -6,8 +70,28 @@ chrome.extension = {
     return url.format({
       protocol: window.location.protocol,
       slashes: true,
-      hostname: window.location.hostname,
+      hostname: currentExtensionId,
       pathname: path
     })
   }
 }
+
+chrome.runtime = {
+  getURL: chrome.extension.getURL,
+
+  onConnect: new OnConnect(),
+
+  connect (...args) {
+    // Parse the optional args.
+    let extensionId = currentExtensionId
+    let connectInfo = {name: ''}
+    if (args.length === 1) {
+      connectInfo = args[0]
+    } else if (args.length === 2) {
+      [extensionId, connectInfo] = args
+    }
+
+    const webContentsId = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', extensionId, connectInfo)
+    return new Port(webContentsId, extensionId, connectInfo.name)
+  }
+}

From 599d3c147b909137bfdd9191e0e70948678e0943 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 10:39:11 +0900
Subject: [PATCH 457/510] Background pages and content script should be loaded
 on startup

---
 lib/browser/chrome-extension.js | 37 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index b0045294f38e..835d1b150f5b 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -149,10 +149,6 @@ const manifestToExtensionInfo = function (manifest) {
 const loadDevToolsExtensions = function (win, manifests) {
   if (!win.devToolsWebContents) return
 
-  for (const manifest of manifests) {
-    startBackgroundPages(manifest)
-    injectContentScripts(manifest)
-  }
   const extensionInfoArray = manifests.map(manifestToExtensionInfo)
   win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)
 }
@@ -182,20 +178,6 @@ app.on('will-quit', function () {
 
 // We can not use protocol or BrowserWindow until app is ready.
 app.once('ready', function () {
-  // Load persisted extensions.
-  loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions')
-  try {
-    const loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
-    if (Array.isArray(loadedExtensions)) {
-      // Preheat the manifest cache.
-      for (const srcDirectory of loadedExtensions) {
-        getManifestFromPath(srcDirectory)
-      }
-    }
-  } catch (error) {
-    // Ignore error
-  }
-
   // The chrome-extension: can map a extension URL request to real file path.
   const chromeExtensionHandler = function (request, callback) {
     const parsed = url.parse(request.url)
@@ -227,6 +209,23 @@ app.once('ready', function () {
     }
   })
 
+  // Load persisted extensions.
+  loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions')
+  try {
+    const loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
+    if (Array.isArray(loadedExtensions)) {
+      for (const srcDirectory of loadedExtensions) {
+        // Start background pages and set content scripts.
+        const manifest = getManifestFromPath(srcDirectory)
+        startBackgroundPages(manifest)
+        injectContentScripts(manifest)
+      }
+    }
+  } catch (error) {
+    // Ignore error
+  }
+
+  // The public API to add/remove extensions.
   BrowserWindow.addDevToolsExtension = function (srcDirectory) {
     const manifest = getManifestFromPath(srcDirectory)
     if (manifest) {
@@ -245,7 +244,7 @@ app.once('ready', function () {
     delete manifestMap[name]
   }
 
-  // Load persisted extensions when devtools is opened.
+  // Load extensions automatically when devtools is opened.
   const init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)

From d8db695712464cc7e89935a8381101d56012facb Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 12:07:08 +0900
Subject: [PATCH 458/510] Handle port disconnecting

---
 atom/renderer/atom_renderer_client.cc |  5 ++---
 lib/browser/chrome-extension.js       | 27 ++++++++++++++++++++++-----
 lib/renderer/chrome-api.js            | 26 ++++++++++++++++++--------
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 673ec4aa5d75..283930b829a2 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -266,10 +266,9 @@ void AtomRendererClient::DidCreateScriptContext(
 
 void AtomRendererClient::WillReleaseScriptContext(
     v8::Handle<v8::Context> context, content::RenderFrame* render_frame) {
-  if (render_frame->IsMainFrame()) {
-    node::Environment* env = node::Environment::GetCurrent(context);
+  node::Environment* env = node::Environment::GetCurrent(context);
+  if (env)
     mate::EmitEvent(env->isolate(), env->process_object(), "exit");
-  }
 }
 
 bool AtomRendererClient::ShouldFork(blink::WebLocalFrame* frame,
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 835d1b150f5b..0c922d9d3e14 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -78,6 +78,8 @@ const removeBackgroundPages = function (manifest) {
 }
 
 // Handle the chrome.* API messages.
+let nextId = 0
+
 ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, hostname, connectInfo) {
   const page = backgroundPages[hostname]
   if (!page) {
@@ -85,18 +87,33 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, hostname, connectInfo) {
     return
   }
 
-  event.returnValue = page.webContents.id
-  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, hostname, connectInfo)
+  const portId = ++nextId
+  event.returnValue = {webContentsId: page.webContents.id, portId: portId}
+
+  event.sender.once('render-view-deleted', () => {
+    page.webContents.sendToAll(`CHROME_PORT_ONDISCONNECT_${portId}`)
+  })
+  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, connectInfo)
 })
 
-ipcMain.on('CHROME_PORT_POSTMESSAGE', function (event, webContentsId, hostname, message) {
+ipcMain.on('CHROME_PORT_DISCONNECT', function (event, webContentsId, portId) {
   const contents = webContents.fromId(webContentsId)
   if (!contents) {
-    console.error(`Sending message to extension ${hostname} with unkown webContentsId ${webContentsId}`)
+    console.error(`Disconnet to unkown webContentsId ${webContentsId}`)
     return
   }
 
-  contents.sendToAll(`CHROME_PORT_ONMESSAGE_${hostname}`, message)
+  contents.sendToAll(`CHROME_PORT_ONDISCONNECT_${portId}`)
+})
+
+ipcMain.on('CHROME_PORT_POSTMESSAGE', function (event, webContentsId, portId, message) {
+  const contents = webContents.fromId(webContentsId)
+  if (!contents) {
+    console.error(`Sending message to unkown webContentsId ${webContentsId}`)
+    return
+  }
+
+  contents.sendToAll(`CHROME_PORT_ONMESSAGE_${portId}`, message)
 })
 
 // Transfer the content scripts to renderer.
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 84577a7c7941..0040d50bac3d 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -24,8 +24,8 @@ class OnConnect extends Event {
   constructor () {
     super()
 
-    ipcRenderer.on('CHROME_RUNTIME_ONCONNECT', (event, webContentsId, extensionId, connectInfo) => {
-      this.emit(new Port(webContentsId, extensionId, connectInfo.name))
+    ipcRenderer.on('CHROME_RUNTIME_ONCONNECT', (event, webContentsId, portId, connectInfo) => {
+      this.emit(new Port(webContentsId, portId, connectInfo.name))
     })
   }
 }
@@ -41,25 +41,35 @@ class MessageSender {
 }
 
 class Port {
-  constructor (webContentsId, extensionId, name) {
+  constructor (webContentsId, portId, name) {
     this.webContentsId = webContentsId
-    this.extensionId = extensionId
+    this.portId = portId
 
     this.name = name
     this.onDisconnect = new Event()
     this.onMessage = new Event()
     this.sender = new MessageSender()
 
-    ipcRenderer.on(`CHROME_PORT_ONMESSAGE_${extensionId}`, (event, message) => {
+    ipcRenderer.once(`CHROME_PORT_ONDISCONNECT_${portId}`, () => {
+      this._onDisconnect()
+    })
+    ipcRenderer.on(`CHROME_PORT_ONMESSAGE_${portId}`, (event, message) => {
       this.onMessage.emit(message, new MessageSender(), function () {})
     })
   }
 
   disconnect () {
+    ipcRenderer.send('CHROME_PORT_DISCONNECT', this.webContentsId, this.portId)
+    this._onDisconnect()
   }
 
   postMessage (message) {
-    ipcRenderer.send('CHROME_PORT_POSTMESSAGE', this.webContentsId, this.extensionId, message)
+    ipcRenderer.send('CHROME_PORT_POSTMESSAGE', this.webContentsId, this.portId, message)
+  }
+
+  _onDisconnect() {
+    ipcRenderer.removeAllListeners(`CHROME_PORT_ONMESSAGE_${this.portId}`)
+    this.onDisconnect.emit()
   }
 }
 
@@ -91,7 +101,7 @@ chrome.runtime = {
       [extensionId, connectInfo] = args
     }
 
-    const webContentsId = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', extensionId, connectInfo)
-    return new Port(webContentsId, extensionId, connectInfo.name)
+    const {webContentsId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', extensionId, connectInfo)
+    return new Port(webContentsId, portId, connectInfo.name)
   }
 }

From f5b430d9e16777aa97c0d1e674299146e10ce597 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 15:37:44 +0900
Subject: [PATCH 459/510] Inject chrome.* to content scripts

---
 lib/browser/chrome-extension.js          |  5 +-
 lib/renderer/chrome-api.js               | 63 +++++++++++++-----------
 lib/renderer/content-scripts-injector.js | 19 +++++--
 lib/renderer/init.js                     |  2 +-
 4 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 0c922d9d3e14..a03be0432ca2 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -123,7 +123,10 @@ const injectContentScripts = function (manifest) {
   if (contentScripts[manifest.name] || !manifest.content_scripts) return
 
   const readArrayOfFiles = function (relativePath) {
-    return String(fs.readFileSync(path.join(manifest.srcDirectory, relativePath)))
+    return {
+      url: `chrome-extension://${manifest.hostname}/${relativePath}`,
+      code: String(fs.readFileSync(path.join(manifest.srcDirectory, relativePath)))
+    }
   }
 
   const contentScriptToEntry = function (script) {
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 0040d50bac3d..a1bbbe5f102a 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -1,9 +1,6 @@
 const {ipcRenderer} = require('electron')
 const url = require('url')
 
-// TODO(zcbenz): Set it to correct value for content scripts.
-const currentExtensionId = window.location.hostname
-
 class Event {
   constructor () {
     this.listeners = []
@@ -13,6 +10,13 @@ class Event {
     this.listeners.push(callback)
   }
 
+  removeListener (callback) {
+    const index = this.listeners.indexOf(callback)
+    if (index !== -1) {
+      this.listeners.splice(index, 1)
+    }
+  }
+
   emit (...args) {
     for (const listener of this.listeners) {
       listener(...args)
@@ -67,41 +71,44 @@ class Port {
     ipcRenderer.send('CHROME_PORT_POSTMESSAGE', this.webContentsId, this.portId, message)
   }
 
-  _onDisconnect() {
+  _onDisconnect () {
     ipcRenderer.removeAllListeners(`CHROME_PORT_ONMESSAGE_${this.portId}`)
     this.onDisconnect.emit()
   }
 }
 
-const chrome = window.chrome = window.chrome || {}
+// Inject chrome API to the |context|
+exports.injectTo = function (extensionId, context) {
+  const chrome = context.chrome = context.chrome || {}
 
-chrome.extension = {
-  getURL: function (path) {
-    return url.format({
-      protocol: window.location.protocol,
-      slashes: true,
-      hostname: currentExtensionId,
-      pathname: path
-    })
-  }
-}
+  chrome.runtime = {
+    getURL: function (path) {
+      return url.format({
+        protocol: 'chrome-extension',
+        slashes: true,
+        hostname: extensionId,
+        pathname: path
+      })
+    },
 
-chrome.runtime = {
-  getURL: chrome.extension.getURL,
+    onConnect: new OnConnect(),
 
-  onConnect: new OnConnect(),
+    connect (...args) {
+      // Parse the optional args.
+      let targetExtensionId = extensionId
+      let connectInfo = {name: ''}
+      if (args.length === 1) {
+        connectInfo = args[0]
+      } else if (args.length === 2) {
+        [targetExtensionId, connectInfo] = args
+      }
 
-  connect (...args) {
-    // Parse the optional args.
-    let extensionId = currentExtensionId
-    let connectInfo = {name: ''}
-    if (args.length === 1) {
-      connectInfo = args[0]
-    } else if (args.length === 2) {
-      [extensionId, connectInfo] = args
+      const {webContentsId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', targetExtensionId, connectInfo)
+      return new Port(webContentsId, portId, connectInfo.name)
     }
+  }
 
-    const {webContentsId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', extensionId, connectInfo)
-    return new Port(webContentsId, portId, connectInfo.name)
+  chrome.extension = {
+    getURL: chrome.runtime.getURL
   }
 }
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
index 07f330b7cc15..4e85d587ad36 100644
--- a/lib/renderer/content-scripts-injector.js
+++ b/lib/renderer/content-scripts-injector.js
@@ -1,4 +1,4 @@
-const {webFrame} = require('electron')
+const {runInThisContext} = require('vm')
 
 // Check whether pattern matches.
 // https://developer.chrome.com/extensions/match_patterns
@@ -9,6 +9,19 @@ const matchesPattern = function (pattern) {
   return location.href.match(regexp)
 }
 
+// Run the code with chrome API integrated.
+const runContentScript = function (extensionId, url, code) {
+  const chrome = {}
+  require('./chrome-api').injectTo(extensionId, chrome)
+  const wrapper = `(function (chrome) {\n  ${code}\n  })`
+  const compiledWrapper = runInThisContext(wrapper, {
+    filename: url,
+    lineOffset: 1,
+    displayErrors: true
+  })
+  compiledWrapper.call(this, chrome)
+}
+
 // Run injected scripts.
 // https://developer.chrome.com/extensions/content_scripts
 const injectContentScript = function (script) {
@@ -16,8 +29,8 @@ const injectContentScript = function (script) {
     if (!matchesPattern(match)) return
   }
 
-  for (const js of script.js) {
-    const fire = () => webFrame.executeJavaScript(js)
+  for (const {url, code} of script.js) {
+    const fire = runContentScript.bind(window, script.extensionId, url, code)
     if (script.runAt === 'document_start') {
       process.once('document-start', fire)
     } else if (script.runAt === 'document_end') {
diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index 6138b6ba575b..b0baf438c6c9 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -63,7 +63,7 @@ if (window.location.protocol === 'chrome-devtools:') {
   nodeIntegration = 'true'
 } else if (window.location.protocol === 'chrome-extension:') {
   // Add implementations of chrome API.
-  require('./chrome-api')
+  require('./chrome-api').injectTo(window.location.hostname, window)
   nodeIntegration = 'true'
 } else {
   // Override default web functions.

From db941213601d389be2b1d8abf0b52694f0d9a9e0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 16:01:16 +0900
Subject: [PATCH 460/510] Implement port.sender

---
 lib/browser/chrome-extension.js |  2 +-
 lib/renderer/chrome-api.js      | 39 +++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index a03be0432ca2..0dac4f985e0b 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -93,7 +93,7 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, hostname, connectInfo) {
   event.sender.once('render-view-deleted', () => {
     page.webContents.sendToAll(`CHROME_PORT_ONDISCONNECT_${portId}`)
   })
-  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, connectInfo)
+  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, hostname, connectInfo)
 })
 
 ipcMain.on('CHROME_PORT_DISCONNECT', function (event, webContentsId, portId) {
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index a1bbbe5f102a..0c9fbe9e9e7b 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -24,41 +24,36 @@ class Event {
   }
 }
 
-class OnConnect extends Event {
-  constructor () {
-    super()
-
-    ipcRenderer.on('CHROME_RUNTIME_ONCONNECT', (event, webContentsId, portId, connectInfo) => {
-      this.emit(new Port(webContentsId, portId, connectInfo.name))
-    })
+class Tab {
+  constructor (webContentsId) {
+    this.id = webContentsId
   }
 }
 
 class MessageSender {
-  constructor () {
-    this.tab = null
-    this.frameId = null
-    this.id = null
-    this.url = null
-    this.tlsChannelId = null
+  constructor (webContentsId, extensionId) {
+    this.tab = new Tab(webContentsId)
+    this.id = extensionId
+    this.url = `chrome-extension://${extensionId}`
   }
 }
 
 class Port {
-  constructor (webContentsId, portId, name) {
+  constructor (webContentsId, portId, extensionId, name) {
     this.webContentsId = webContentsId
     this.portId = portId
 
     this.name = name
     this.onDisconnect = new Event()
     this.onMessage = new Event()
-    this.sender = new MessageSender()
+    this.sender = new MessageSender(webContentsId, extensionId)
 
     ipcRenderer.once(`CHROME_PORT_ONDISCONNECT_${portId}`, () => {
       this._onDisconnect()
     })
     ipcRenderer.on(`CHROME_PORT_ONMESSAGE_${portId}`, (event, message) => {
-      this.onMessage.emit(message, new MessageSender(), function () {})
+      const sendResponse = function () { console.error('sendResponse is not implemented') }
+      this.onMessage.emit(message, this.sender, sendResponse)
     })
   }
 
@@ -77,6 +72,16 @@ class Port {
   }
 }
 
+class OnConnect extends Event {
+  constructor () {
+    super()
+
+    ipcRenderer.on('CHROME_RUNTIME_ONCONNECT', (event, webContentsId, portId, extensionId, connectInfo) => {
+      this.emit(new Port(webContentsId, portId, extensionId, connectInfo.name))
+    })
+  }
+}
+
 // Inject chrome API to the |context|
 exports.injectTo = function (extensionId, context) {
   const chrome = context.chrome = context.chrome || {}
@@ -104,7 +109,7 @@ exports.injectTo = function (extensionId, context) {
       }
 
       const {webContentsId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', targetExtensionId, connectInfo)
-      return new Port(webContentsId, portId, connectInfo.name)
+      return new Port(webContentsId, portId, extensionId, connectInfo.name)
     }
   }
 

From 31628abadc94f737d461f0ae0f776c34db8e6d07 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 16:41:12 +0900
Subject: [PATCH 461/510] Implement chrome.tabs.executeScript

---
 lib/browser/chrome-extension.js          | 29 ++++++++++++++++++++++++
 lib/renderer/chrome-api.js               | 12 ++++++++++
 lib/renderer/content-scripts-injector.js |  9 +++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 0dac4f985e0b..6f710f917ca2 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -116,6 +116,35 @@ ipcMain.on('CHROME_PORT_POSTMESSAGE', function (event, webContentsId, portId, me
   contents.sendToAll(`CHROME_PORT_ONMESSAGE_${portId}`, message)
 })
 
+ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, hostname, details) {
+  const contents = webContents.fromId(webContentsId)
+  if (!contents) {
+    console.error(`Sending message to unkown webContentsId ${webContentsId}`)
+    return
+  }
+
+  let code, url
+  if (details.file) {
+    code = String(fs.readFileSync(path.join(manifest.srcDirectory, details.file)))
+    url = `chrome-extension://${hostname}/${details.file}`
+  } else {
+    code = details.code
+    url = `chrome-extension://${hostname}/${String(Math.random()).substr(2, 8)}.js`
+  }
+
+  contents.send('CHROME_TABS_EXECUTESCRIPT', requestId, event.sender.id, hostname, url, code)
+})
+
+ipcMain.on(`CHROME_TABS_EXECUTESCRIPT_RESULT`, (event, requestId, webContentsId, result) => {
+  const contents = webContents.fromId(webContentsId)
+  if (!contents) {
+    console.error(`Sending message to unkown webContentsId ${webContentsId}`)
+    return
+  }
+
+  contents.send(`CHROME_TABS_EXECUTESCRIPT_RESULT_${requestId}`, result)
+})
+
 // Transfer the content scripts to renderer.
 const contentScripts = {}
 
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 0c9fbe9e9e7b..a0925599cca1 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -1,6 +1,8 @@
 const {ipcRenderer} = require('electron')
 const url = require('url')
 
+let nextId = 0
+
 class Event {
   constructor () {
     this.listeners = []
@@ -113,6 +115,16 @@ exports.injectTo = function (extensionId, context) {
     }
   }
 
+  chrome.tabs = {
+    executeScript (tabId, details, callback) {
+      const requestId = ++nextId
+      ipcRenderer.once(`CHROME_TABS_EXECUTESCRIPT_RESULT_${requestId}`, (event, result) => {
+        callback([event.result])
+      })
+      ipcRenderer.send('CHROME_TABS_EXECUTESCRIPT', requestId, tabId, extensionId, details)
+    }
+  }
+
   chrome.extension = {
     getURL: chrome.runtime.getURL
   }
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
index 4e85d587ad36..1ef9fc2137d6 100644
--- a/lib/renderer/content-scripts-injector.js
+++ b/lib/renderer/content-scripts-injector.js
@@ -1,3 +1,4 @@
+const {ipcRenderer} = require('electron')
 const {runInThisContext} = require('vm')
 
 // Check whether pattern matches.
@@ -19,7 +20,7 @@ const runContentScript = function (extensionId, url, code) {
     lineOffset: 1,
     displayErrors: true
   })
-  compiledWrapper.call(this, chrome)
+  return compiledWrapper.call(this, chrome)
 }
 
 // Run injected scripts.
@@ -41,6 +42,12 @@ const injectContentScript = function (script) {
   }
 }
 
+// Handle the request of chrome.tabs.executeJavaScript.
+ipcRenderer.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, senderId, extensionId, url, code) {
+  const result = runContentScript.call(window, extensionId, url, code)
+  ipcRenderer.send('CHROME_TABS_EXECUTESCRIPT_RESULT', requestId, senderId, result)
+})
+
 // Read the renderer process preferences.
 const preferences = process.getRenderProcessPreferences()
 if (preferences) {

From d55b96fdf511a10ad647ae03596a105c61901d3e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 17:51:49 +0900
Subject: [PATCH 462/510] Clean up the Chrome API implementation code

---
 lib/browser/chrome-extension.js          | 86 ++++++++++++------------
 lib/renderer/chrome-api.js               |  4 ++
 lib/renderer/content-scripts-injector.js | 14 ++--
 3 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 6f710f917ca2..e9abb998b806 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -10,37 +10,27 @@ const objectValues = function (object) {
   return Object.keys(object).map(function (key) { return object[key] })
 }
 
-// Mapping between hostname and file path.
-const hostPathMap = {}
-let hostPathMapNextKey = 0
+// Mapping between extensionId(hostname) and manifest.
+const manifestMap = {}  // extensionId => manifest
+const manifestNameMap = {}  // name => manifest
 
-const generateHostForPath = function (path) {
-  const key = `extension-${++hostPathMapNextKey}`
-  hostPathMap[key] = path
-  return key
-}
-
-const getPathForHost = function (host) {
-  return hostPathMap[host]
-}
-
-// Cache manifests.
-const manifestMap = {}
+let nextExtensionId = 0
 
+// Create or get manifest object from |srcDirectory|.
 const getManifestFromPath = function (srcDirectory) {
   const manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
-  if (!manifestMap[manifest.name]) {
-    const hostname = generateHostForPath(srcDirectory)
-    manifestMap[manifest.name] = manifest
+  if (!manifestNameMap[manifest.name]) {
+    const extensionId = `extension-${++nextExtensionId}`
+    manifestMap[extensionId] = manifestNameMap[manifest.name] = manifest
     Object.assign(manifest, {
       srcDirectory: srcDirectory,
-      hostname: hostname,
+      extensionId: extensionId,
       // We can not use 'file://' directly because all resources in the extension
       // will be treated as relative to the root in Chrome.
       startPage: url.format({
         protocol: 'chrome-extension',
         slashes: true,
-        hostname: hostname,
+        hostname: extensionId,
         pathname: manifest.devtools_page
       })
     })
@@ -52,7 +42,7 @@ const getManifestFromPath = function (srcDirectory) {
 const backgroundPages = {}
 
 const startBackgroundPages = function (manifest) {
-  if (backgroundPages[manifest.hostname] || !manifest.background) return
+  if (backgroundPages[manifest.extensionId] || !manifest.background) return
 
   const scripts = manifest.background.scripts.map((name) => {
     return `<script src="${name}"></script>`
@@ -60,30 +50,29 @@ const startBackgroundPages = function (manifest) {
   const html = new Buffer(`<html><body>${scripts}</body></html>`)
 
   const contents = webContents.create({})
-  backgroundPages[manifest.hostname] = { html: html, webContents: contents }
+  backgroundPages[manifest.extensionId] = { html: html, webContents: contents }
   contents.loadURL(url.format({
     protocol: 'chrome-extension',
     slashes: true,
-    hostname: manifest.hostname,
+    hostname: manifest.extensionId,
     pathname: '_generated_background_page.html'
   }))
-  contents.openDevTools()
 }
 
 const removeBackgroundPages = function (manifest) {
-  if (!backgroundPages[manifest.hostname]) return
+  if (!backgroundPages[manifest.extensionId]) return
 
-  backgroundPages[manifest.hostname].webContents.destroy()
-  delete backgroundPages[manifest.hostname]
+  backgroundPages[manifest.extensionId].webContents.destroy()
+  delete backgroundPages[manifest.extensionId]
 }
 
 // Handle the chrome.* API messages.
 let nextId = 0
 
-ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, hostname, connectInfo) {
-  const page = backgroundPages[hostname]
+ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo) {
+  const page = backgroundPages[extensionId]
   if (!page) {
-    console.error(`Connect to unkown extension ${hostname}`)
+    console.error(`Connect to unkown extension ${extensionId}`)
     return
   }
 
@@ -93,7 +82,7 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, hostname, connectInfo) {
   event.sender.once('render-view-deleted', () => {
     page.webContents.sendToAll(`CHROME_PORT_ONDISCONNECT_${portId}`)
   })
-  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, hostname, connectInfo)
+  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, extensionId, connectInfo)
 })
 
 ipcMain.on('CHROME_PORT_DISCONNECT', function (event, webContentsId, portId) {
@@ -116,7 +105,7 @@ ipcMain.on('CHROME_PORT_POSTMESSAGE', function (event, webContentsId, portId, me
   contents.sendToAll(`CHROME_PORT_ONMESSAGE_${portId}`, message)
 })
 
-ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, hostname, details) {
+ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, extensionId, details) {
   const contents = webContents.fromId(webContentsId)
   if (!contents) {
     console.error(`Sending message to unkown webContentsId ${webContentsId}`)
@@ -125,17 +114,18 @@ ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsI
 
   let code, url
   if (details.file) {
+    const manifest = manifestMap[extensionId]
     code = String(fs.readFileSync(path.join(manifest.srcDirectory, details.file)))
-    url = `chrome-extension://${hostname}/${details.file}`
+    url = `chrome-extension://${extensionId}${details.file}`
   } else {
     code = details.code
-    url = `chrome-extension://${hostname}/${String(Math.random()).substr(2, 8)}.js`
+    url = `chrome-extension://${extensionId}/${String(Math.random()).substr(2, 8)}.js`
   }
 
-  contents.send('CHROME_TABS_EXECUTESCRIPT', requestId, event.sender.id, hostname, url, code)
+  contents.send('CHROME_TABS_EXECUTESCRIPT', requestId, event.sender.id, extensionId, url, code)
 })
 
-ipcMain.on(`CHROME_TABS_EXECUTESCRIPT_RESULT`, (event, requestId, webContentsId, result) => {
+ipcMain.on('CHROME_TABS_EXECUTESCRIPT_RESULT', (event, requestId, webContentsId, result) => {
   const contents = webContents.fromId(webContentsId)
   if (!contents) {
     console.error(`Sending message to unkown webContentsId ${webContentsId}`)
@@ -153,7 +143,7 @@ const injectContentScripts = function (manifest) {
 
   const readArrayOfFiles = function (relativePath) {
     return {
-      url: `chrome-extension://${manifest.hostname}/${relativePath}`,
+      url: `chrome-extension://${manifest.extensionId}/${relativePath}`,
       code: String(fs.readFileSync(path.join(manifest.srcDirectory, relativePath)))
     }
   }
@@ -168,6 +158,7 @@ const injectContentScripts = function (manifest) {
 
   try {
     const entry = {
+      extensionId: manifest.extensionId,
       contentScripts: manifest.content_scripts.map(contentScriptToEntry)
     }
     contentScripts[manifest.name] = renderProcessPreferences.addEntry(entry)
@@ -195,9 +186,16 @@ const manifestToExtensionInfo = function (manifest) {
 }
 
 // Load the extensions for the window.
+const loadExtension = function (manifest) {
+  startBackgroundPages(manifest)
+  injectContentScripts(manifest)
+}
+
 const loadDevToolsExtensions = function (win, manifests) {
   if (!win.devToolsWebContents) return
 
+  manifests.forEach(loadExtension)
+
   const extensionInfoArray = manifests.map(manifestToExtensionInfo)
   win.devToolsWebContents.executeJavaScript(`DevToolsAPI.addExtensions(${JSON.stringify(extensionInfoArray)})`)
 }
@@ -233,8 +231,8 @@ app.once('ready', function () {
     if (!parsed.hostname || !parsed.path) return callback()
     if (!/extension-\d+/.test(parsed.hostname)) return callback()
 
-    const directory = getPathForHost(parsed.hostname)
-    if (!directory) return callback()
+    const manifest = manifestMap[parsed.hostname]
+    if (!manifest) return callback()
 
     if (parsed.path === '/_generated_background_page.html' &&
         backgroundPages[parsed.hostname]) {
@@ -244,7 +242,7 @@ app.once('ready', function () {
       })
     }
 
-    fs.readFile(path.join(directory, parsed.path), function (err, content) {
+    fs.readFile(path.join(manifest.srcDirectory, parsed.path), function (err, content) {
       if (err) {
         return callback(-6)  // FILE_NOT_FOUND
       } else {
@@ -266,8 +264,7 @@ app.once('ready', function () {
       for (const srcDirectory of loadedExtensions) {
         // Start background pages and set content scripts.
         const manifest = getManifestFromPath(srcDirectory)
-        startBackgroundPages(manifest)
-        injectContentScripts(manifest)
+        loadExtension(manifest)
       }
     }
   } catch (error) {
@@ -285,12 +282,13 @@ app.once('ready', function () {
     }
   }
   BrowserWindow.removeDevToolsExtension = function (name) {
-    const manifest = manifestMap[name]
+    const manifest = manifestNameMap[name]
     if (!manifest) return
 
     removeBackgroundPages(manifest)
     removeContentScripts(manifest)
-    delete manifestMap[name]
+    delete manifestMap[manifest.extensionId]
+    delete manifestNameMap[name]
   }
 
   // Load extensions automatically when devtools is opened.
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index a0925599cca1..c49fbd2f8efe 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -44,6 +44,7 @@ class Port {
   constructor (webContentsId, portId, extensionId, name) {
     this.webContentsId = webContentsId
     this.portId = portId
+    this.disconnected = false
 
     this.name = name
     this.onDisconnect = new Event()
@@ -60,6 +61,8 @@ class Port {
   }
 
   disconnect () {
+    if (this.disconnected) return
+
     ipcRenderer.send('CHROME_PORT_DISCONNECT', this.webContentsId, this.portId)
     this._onDisconnect()
   }
@@ -69,6 +72,7 @@ class Port {
   }
 
   _onDisconnect () {
+    this.disconnected = true
     ipcRenderer.removeAllListeners(`CHROME_PORT_ONMESSAGE_${this.portId}`)
     this.onDisconnect.emit()
   }
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
index 1ef9fc2137d6..6e41a8d4f116 100644
--- a/lib/renderer/content-scripts-injector.js
+++ b/lib/renderer/content-scripts-injector.js
@@ -12,26 +12,26 @@ const matchesPattern = function (pattern) {
 
 // Run the code with chrome API integrated.
 const runContentScript = function (extensionId, url, code) {
-  const chrome = {}
-  require('./chrome-api').injectTo(extensionId, chrome)
+  const context = {}
+  require('./chrome-api').injectTo(extensionId, context)
   const wrapper = `(function (chrome) {\n  ${code}\n  })`
   const compiledWrapper = runInThisContext(wrapper, {
     filename: url,
     lineOffset: 1,
     displayErrors: true
   })
-  return compiledWrapper.call(this, chrome)
+  return compiledWrapper.call(this, context.chrome)
 }
 
 // Run injected scripts.
 // https://developer.chrome.com/extensions/content_scripts
-const injectContentScript = function (script) {
+const injectContentScript = function (extensionId, script) {
   for (const match of script.matches) {
     if (!matchesPattern(match)) return
   }
 
   for (const {url, code} of script.js) {
-    const fire = runContentScript.bind(window, script.extensionId, url, code)
+    const fire = runContentScript.bind(window, extensionId, url, code)
     if (script.runAt === 'document_start') {
       process.once('document-start', fire)
     } else if (script.runAt === 'document_end') {
@@ -53,7 +53,9 @@ const preferences = process.getRenderProcessPreferences()
 if (preferences) {
   for (const pref of preferences) {
     if (pref.contentScripts) {
-      pref.contentScripts.forEach(injectContentScript)
+      for (const script of pref.contentScripts) {
+        injectContentScript(pref.extensionId, script)
+      }
     }
   }
 }

From ae1f442b0235afc4e6f211b8a9cb7f6150362c34 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 21:19:50 +0900
Subject: [PATCH 463/510] Add ipcRenderer.sendTo

---
 lib/browser/rpc-server.js        | 12 +++++++++++-
 lib/renderer/api/ipc-renderer.js |  8 ++++++++
 lib/renderer/chrome-api.js       | 21 ++++++++++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index fe264cceeeff..8dc90e862cf9 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -2,7 +2,7 @@
 
 const electron = require('electron')
 const v8Util = process.atomBinding('v8_util')
-const {ipcMain, isPromise} = electron
+const {ipcMain, isPromise, webContents} = electron
 
 const objectsRegistry = require('./objects-registry')
 
@@ -351,3 +351,13 @@ ipcMain.on('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', function (event, request
     event.returnValue = exceptionToMeta(error)
   }
 })
+
+ipcMain.on('ELECTRON_BROWSER_SEND_TO', function (event, webContentsId, channel, ...args) {
+  let contents = webContents.fromId(webContentsId)
+  if (!contents) {
+    console.error(`Sending message to WebContents with unknown ID ${webContentsId}`)
+    return
+  }
+
+  contents.send(channel, ...args)
+})
diff --git a/lib/renderer/api/ipc-renderer.js b/lib/renderer/api/ipc-renderer.js
index a6b6b1851ea3..24bb9fe0be91 100644
--- a/lib/renderer/api/ipc-renderer.js
+++ b/lib/renderer/api/ipc-renderer.js
@@ -18,4 +18,12 @@ ipcRenderer.sendToHost = function (...args) {
   return binding.send('ipc-message-host', args)
 }
 
+ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
+  if (typeof webContentsId !== 'number') {
+    throw new TypeError(`First argument has to be webContentsId`)
+  }
+
+  ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', webContentsId, channel, ...args)
+}
+
 module.exports = ipcRenderer
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index c49fbd2f8efe..40c37aafc2a3 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -130,6 +130,25 @@ exports.injectTo = function (extensionId, context) {
   }
 
   chrome.extension = {
-    getURL: chrome.runtime.getURL
+    getURL: chrome.runtime.getURL,
+    connect: chrome.runtime.connect
+    onConnect: chrome.runtime.onConnect
+  }
+
+  chrome.storage = {
+    sync: {
+      get () {},
+      set () {}
+    }
+  }
+
+  chrome.pageAction = {
+    show: () {},
+    hide: () {},
+    setTitle: () {},
+    getTitle: () {},
+    setIcon: () {},
+    setPopup: () {},
+    getPopup: () {}
   }
 }

From a58b84bbd76a931c43dfe1c5b9e9908a5f108518 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 18 May 2016 22:14:51 +0900
Subject: [PATCH 464/510] spec: ipcRenderer.sendTo sends message to WebContents

---
 spec/api-ipc-spec.js               | 31 +++++++++++++++++++++++++-----
 spec/fixtures/pages/ping-pong.html | 11 +++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 spec/fixtures/pages/ping-pong.html

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index 102b23ece567..46aa847c17d0 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -3,11 +3,8 @@
 const assert = require('assert')
 const path = require('path')
 
-const ipcRenderer = require('electron').ipcRenderer
-const remote = require('electron').remote
-
-const ipcMain = remote.require('electron').ipcMain
-const BrowserWindow = remote.require('electron').BrowserWindow
+const {ipcRenderer, remote} = require('electron')
+const {ipcMain, webContents, BrowserWindow} = remote
 
 const comparePaths = function (path1, path2) {
   if (process.platform === 'win32') {
@@ -237,6 +234,30 @@ describe('ipc module', function () {
     })
   })
 
+  describe('ipcRenderer.sendTo', function () {
+    let contents = null
+    beforeEach(function () {
+      contents = webContents.create({})
+    })
+    afterEach(function () {
+      ipcRenderer.removeAllListeners('pong')
+      contents.destroy()
+      contents = null
+    })
+
+    it('sends message to WebContents', function (done) {
+      const webContentsId = remote.getCurrentWebContents().id
+      ipcRenderer.once('pong', function (event, id) {
+        assert.equal(webContentsId, id)
+        done()
+      })
+      contents.once('did-finish-load', function () {
+        ipcRenderer.sendTo(contents.id, 'ping', webContentsId)
+      })
+      contents.loadURL('file://' + path.join(fixtures, 'pages', 'ping-pong.html'))
+    })
+  })
+
   describe('remote listeners', function () {
     var w = null
 
diff --git a/spec/fixtures/pages/ping-pong.html b/spec/fixtures/pages/ping-pong.html
new file mode 100644
index 000000000000..d10e7898653b
--- /dev/null
+++ b/spec/fixtures/pages/ping-pong.html
@@ -0,0 +1,11 @@
+<html>
+<body>
+<script type="text/javascript" charset="utf-8">
+  const {ipcRenderer} = require('electron')
+  ipcRenderer.on('ping', function (event, id) {
+    ipcRenderer.sendTo(id, 'pong', id)
+  })
+</script>
+</body>
+</html>
+

From ba315248e0731069a982028ea58748d9039d6935 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 21:13:00 +0900
Subject: [PATCH 465/510] Use ipcRenderer.sendTo to get rid of routers in main
 process

---
 lib/browser/chrome-extension.js          | 35 ++----------------------
 lib/browser/rpc-server.js                |  8 ++++--
 lib/renderer/api/ipc-renderer.js         | 10 ++++++-
 lib/renderer/chrome-api.js               | 26 +++++++++---------
 lib/renderer/content-scripts-injector.js |  4 +--
 5 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index e9abb998b806..ad8af7213c10 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -80,31 +80,12 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo)
   event.returnValue = {webContentsId: page.webContents.id, portId: portId}
 
   event.sender.once('render-view-deleted', () => {
-    page.webContents.sendToAll(`CHROME_PORT_ONDISCONNECT_${portId}`)
+    if (page.webContents.isDestroyed()) return
+    page.webContents.sendToAll(`CHROME_PORT_DISCONNECT_${portId}`)
   })
   page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, extensionId, connectInfo)
 })
 
-ipcMain.on('CHROME_PORT_DISCONNECT', function (event, webContentsId, portId) {
-  const contents = webContents.fromId(webContentsId)
-  if (!contents) {
-    console.error(`Disconnet to unkown webContentsId ${webContentsId}`)
-    return
-  }
-
-  contents.sendToAll(`CHROME_PORT_ONDISCONNECT_${portId}`)
-})
-
-ipcMain.on('CHROME_PORT_POSTMESSAGE', function (event, webContentsId, portId, message) {
-  const contents = webContents.fromId(webContentsId)
-  if (!contents) {
-    console.error(`Sending message to unkown webContentsId ${webContentsId}`)
-    return
-  }
-
-  contents.sendToAll(`CHROME_PORT_ONMESSAGE_${portId}`, message)
-})
-
 ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, extensionId, details) {
   const contents = webContents.fromId(webContentsId)
   if (!contents) {
@@ -122,17 +103,7 @@ ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsI
     url = `chrome-extension://${extensionId}/${String(Math.random()).substr(2, 8)}.js`
   }
 
-  contents.send('CHROME_TABS_EXECUTESCRIPT', requestId, event.sender.id, extensionId, url, code)
-})
-
-ipcMain.on('CHROME_TABS_EXECUTESCRIPT_RESULT', (event, requestId, webContentsId, result) => {
-  const contents = webContents.fromId(webContentsId)
-  if (!contents) {
-    console.error(`Sending message to unkown webContentsId ${webContentsId}`)
-    return
-  }
-
-  contents.send(`CHROME_TABS_EXECUTESCRIPT_RESULT_${requestId}`, result)
+  contents.send('CHROME_TABS_EXECUTESCRIPT', event.sender.id, requestId, extensionId, url, code)
 })
 
 // Transfer the content scripts to renderer.
diff --git a/lib/browser/rpc-server.js b/lib/browser/rpc-server.js
index 8dc90e862cf9..68cfcaf297f2 100644
--- a/lib/browser/rpc-server.js
+++ b/lib/browser/rpc-server.js
@@ -352,12 +352,16 @@ ipcMain.on('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', function (event, request
   }
 })
 
-ipcMain.on('ELECTRON_BROWSER_SEND_TO', function (event, webContentsId, channel, ...args) {
+ipcMain.on('ELECTRON_BROWSER_SEND_TO', function (event, sendToAll, webContentsId, channel, ...args) {
   let contents = webContents.fromId(webContentsId)
   if (!contents) {
     console.error(`Sending message to WebContents with unknown ID ${webContentsId}`)
     return
   }
 
-  contents.send(channel, ...args)
+  if (sendToAll) {
+    contents.sendToAll(channel, ...args)
+  } else {
+    contents.send(channel, ...args)
+  }
 })
diff --git a/lib/renderer/api/ipc-renderer.js b/lib/renderer/api/ipc-renderer.js
index 24bb9fe0be91..1081475bbeac 100644
--- a/lib/renderer/api/ipc-renderer.js
+++ b/lib/renderer/api/ipc-renderer.js
@@ -23,7 +23,15 @@ ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
     throw new TypeError(`First argument has to be webContentsId`)
   }
 
-  ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', webContentsId, channel, ...args)
+  ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', false, webContentsId, channel, ...args)
+}
+
+ipcRenderer.sendToAll = function (webContentsId, channel, ...args) {
+  if (typeof webContentsId !== 'number') {
+    throw new TypeError(`First argument has to be webContentsId`)
+  }
+
+  ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', true, webContentsId, channel, ...args)
 }
 
 module.exports = ipcRenderer
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 40c37aafc2a3..646e5bdee187 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -51,10 +51,10 @@ class Port {
     this.onMessage = new Event()
     this.sender = new MessageSender(webContentsId, extensionId)
 
-    ipcRenderer.once(`CHROME_PORT_ONDISCONNECT_${portId}`, () => {
+    ipcRenderer.once(`CHROME_PORT_DISCONNECT_${portId}`, () => {
       this._onDisconnect()
     })
-    ipcRenderer.on(`CHROME_PORT_ONMESSAGE_${portId}`, (event, message) => {
+    ipcRenderer.on(`CHROME_PORT_POSTMESSAGE_${portId}`, (event, message) => {
       const sendResponse = function () { console.error('sendResponse is not implemented') }
       this.onMessage.emit(message, this.sender, sendResponse)
     })
@@ -63,17 +63,17 @@ class Port {
   disconnect () {
     if (this.disconnected) return
 
-    ipcRenderer.send('CHROME_PORT_DISCONNECT', this.webContentsId, this.portId)
+    ipcRenderer.sendToAll(this.webContentsId, `CHROME_PORT_DISCONNECT_${this.portId}`)
     this._onDisconnect()
   }
 
   postMessage (message) {
-    ipcRenderer.send('CHROME_PORT_POSTMESSAGE', this.webContentsId, this.portId, message)
+    ipcRenderer.sendToAll(this.webContentsId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
   }
 
   _onDisconnect () {
     this.disconnected = true
-    ipcRenderer.removeAllListeners(`CHROME_PORT_ONMESSAGE_${this.portId}`)
+    ipcRenderer.removeAllListeners(`CHROME_PORT_POSTMESSAGE_${this.portId}`)
     this.onDisconnect.emit()
   }
 }
@@ -131,7 +131,7 @@ exports.injectTo = function (extensionId, context) {
 
   chrome.extension = {
     getURL: chrome.runtime.getURL,
-    connect: chrome.runtime.connect
+    connect: chrome.runtime.connect,
     onConnect: chrome.runtime.onConnect
   }
 
@@ -143,12 +143,12 @@ exports.injectTo = function (extensionId, context) {
   }
 
   chrome.pageAction = {
-    show: () {},
-    hide: () {},
-    setTitle: () {},
-    getTitle: () {},
-    setIcon: () {},
-    setPopup: () {},
-    getPopup: () {}
+    show () {},
+    hide () {},
+    setTitle () {},
+    getTitle () {},
+    setIcon () {},
+    setPopup () {},
+    getPopup () {}
   }
 }
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
index 6e41a8d4f116..80115a6c5394 100644
--- a/lib/renderer/content-scripts-injector.js
+++ b/lib/renderer/content-scripts-injector.js
@@ -43,9 +43,9 @@ const injectContentScript = function (extensionId, script) {
 }
 
 // Handle the request of chrome.tabs.executeJavaScript.
-ipcRenderer.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, senderId, extensionId, url, code) {
+ipcRenderer.on('CHROME_TABS_EXECUTESCRIPT', function (event, senderWebContentsId, requestId, extensionId, url, code) {
   const result = runContentScript.call(window, extensionId, url, code)
-  ipcRenderer.send('CHROME_TABS_EXECUTESCRIPT_RESULT', requestId, senderId, result)
+  ipcRenderer.sendToAll(senderWebContentsId, `CHROME_TABS_EXECUTESCRIPT_RESULT_${requestId}`, result)
 })
 
 // Read the renderer process preferences.

From 62fb4f98202261dfa0ea9da8406f718d8c23871c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 21:23:43 +0900
Subject: [PATCH 466/510] Implement chrome.runtime.sendMessage

---
 lib/browser/chrome-extension.js | 10 ++++++++++
 lib/renderer/chrome-api.js      | 34 +++++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index ad8af7213c10..57c40ddcda93 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -86,6 +86,16 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo)
   page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, extensionId, connectInfo)
 })
 
+ipcMain.on('CHROME_RUNTIME_SENDMESSAGE', function (event, extensionId, message) {
+  const page = backgroundPages[extensionId]
+  if (!page) {
+    console.error(`Connect to unkown extension ${extensionId}`)
+    return
+  }
+
+  page.webContents.sendToAll('CHROME_RUNTIME_ONMESSAGE', message)
+})
+
 ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, extensionId, details) {
   const contents = webContents.fromId(webContentsId)
   if (!contents) {
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 646e5bdee187..1e9f5495c455 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -88,6 +88,16 @@ class OnConnect extends Event {
   }
 }
 
+class OnMessage extends Event {
+  constructor () {
+    super()
+
+    ipcRenderer.on('CHROME_RUNTIME_ONMESSAGE', (event, message) => {
+      this.emit(message)
+    })
+  }
+}
+
 // Inject chrome API to the |context|
 exports.injectTo = function (extensionId, context) {
   const chrome = context.chrome = context.chrome || {}
@@ -116,7 +126,25 @@ exports.injectTo = function (extensionId, context) {
 
       const {webContentsId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', targetExtensionId, connectInfo)
       return new Port(webContentsId, portId, extensionId, connectInfo.name)
-    }
+    },
+
+    sendMessage (...args) {
+      // Parse the optional args.
+      let targetExtensionId = extensionId
+      let message, options, responseCallback
+      if (args.length === 1) {
+        message = args[0]
+      } else if (args.length === 2) {
+        [targetExtensionId, message] = args
+      } else {
+        console.error('responseCallback is not supported')
+        [targetExtensionId, message, options, responseCallback] = args
+      }
+
+      ipcRenderer.send('CHROME_RUNTIME_SENDMESSAGE', targetExtensionId, message)
+    },
+
+    onMessage: new OnMessage()
   }
 
   chrome.tabs = {
@@ -132,7 +160,9 @@ exports.injectTo = function (extensionId, context) {
   chrome.extension = {
     getURL: chrome.runtime.getURL,
     connect: chrome.runtime.connect,
-    onConnect: chrome.runtime.onConnect
+    onConnect: chrome.runtime.onConnect,
+    sendMessage: chrome.runtime.sendMessage,
+    onMessage: chrome.runtime.onMessage
   }
 
   chrome.storage = {

From 5eb9ed17298ed97a93067324a828de5f24a3650f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 21:35:07 +0900
Subject: [PATCH 467/510] Implement chrome.tabs.sendMessage

---
 lib/browser/chrome-extension.js |  4 ++--
 lib/renderer/chrome-api.js      | 39 ++++++++++++++-------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 57c40ddcda93..ad78e18d998b 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -83,7 +83,7 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo)
     if (page.webContents.isDestroyed()) return
     page.webContents.sendToAll(`CHROME_PORT_DISCONNECT_${portId}`)
   })
-  page.webContents.sendToAll('CHROME_RUNTIME_ONCONNECT', event.sender.id, portId, extensionId, connectInfo)
+  page.webContents.sendToAll(`CHROME_RUNTIME_ONCONNECT_${extensionId}`, event.sender.id, portId, connectInfo)
 })
 
 ipcMain.on('CHROME_RUNTIME_SENDMESSAGE', function (event, extensionId, message) {
@@ -93,7 +93,7 @@ ipcMain.on('CHROME_RUNTIME_SENDMESSAGE', function (event, extensionId, message)
     return
   }
 
-  page.webContents.sendToAll('CHROME_RUNTIME_ONMESSAGE', message)
+  page.webContents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, message)
 })
 
 ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, extensionId, details) {
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 1e9f5495c455..fc3ea3072f8d 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -78,30 +78,18 @@ class Port {
   }
 }
 
-class OnConnect extends Event {
-  constructor () {
-    super()
-
-    ipcRenderer.on('CHROME_RUNTIME_ONCONNECT', (event, webContentsId, portId, extensionId, connectInfo) => {
-      this.emit(new Port(webContentsId, portId, extensionId, connectInfo.name))
-    })
-  }
-}
-
-class OnMessage extends Event {
-  constructor () {
-    super()
-
-    ipcRenderer.on('CHROME_RUNTIME_ONMESSAGE', (event, message) => {
-      this.emit(message)
-    })
-  }
-}
-
 // Inject chrome API to the |context|
 exports.injectTo = function (extensionId, context) {
   const chrome = context.chrome = context.chrome || {}
 
+  ipcRenderer.on(`CHROME_RUNTIME_ONCONNECT_${extensionId}`, (event, webContentsId, portId, connectInfo) => {
+    chrome.runtime.onConnect.emit(new Port(webContentsId, portId, extensionId, connectInfo.name))
+  })
+
+  ipcRenderer.on(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, (event, message) => {
+    chrome.runtime.onMessage.emit(message)
+  })
+
   chrome.runtime = {
     getURL: function (path) {
       return url.format({
@@ -112,7 +100,7 @@ exports.injectTo = function (extensionId, context) {
       })
     },
 
-    onConnect: new OnConnect(),
+    onConnect: new Event(),
 
     connect (...args) {
       // Parse the optional args.
@@ -144,7 +132,7 @@ exports.injectTo = function (extensionId, context) {
       ipcRenderer.send('CHROME_RUNTIME_SENDMESSAGE', targetExtensionId, message)
     },
 
-    onMessage: new OnMessage()
+    onMessage: new Event()
   }
 
   chrome.tabs = {
@@ -154,6 +142,13 @@ exports.injectTo = function (extensionId, context) {
         callback([event.result])
       })
       ipcRenderer.send('CHROME_TABS_EXECUTESCRIPT', requestId, tabId, extensionId, details)
+    },
+
+    sendMessage (tabId, message, options, responseCallback) {
+      if (responseCallback) {
+        console.error('responseCallback is not supported')
+      }
+      ipcRenderer.sendToAll(tabId, `CHROME_RUNTIME_ONMESSAGE_${extensionId}`, message)
     }
   }
 

From 9ed4730cba8fcaa2a0439868a8fb8b98a665c983 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 21:45:23 +0900
Subject: [PATCH 468/510] Pass sender for chrome.runtime.onMessage

---
 lib/browser/chrome-extension.js |  2 +-
 lib/renderer/chrome-api.js      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index ad78e18d998b..9cdebdba7d6c 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -93,7 +93,7 @@ ipcMain.on('CHROME_RUNTIME_SENDMESSAGE', function (event, extensionId, message)
     return
   }
 
-  page.webContents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, message)
+  page.webContents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, event.sender.id, message)
 })
 
 ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, extensionId, details) {
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index fc3ea3072f8d..19bf69f9a0df 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -86,8 +86,8 @@ exports.injectTo = function (extensionId, context) {
     chrome.runtime.onConnect.emit(new Port(webContentsId, portId, extensionId, connectInfo.name))
   })
 
-  ipcRenderer.on(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, (event, message) => {
-    chrome.runtime.onMessage.emit(message)
+  ipcRenderer.on(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, (event, tabId, message) => {
+    chrome.runtime.onMessage.emit(message, new MessageSender(tabId, extensionId))
   })
 
   chrome.runtime = {
@@ -148,8 +148,10 @@ exports.injectTo = function (extensionId, context) {
       if (responseCallback) {
         console.error('responseCallback is not supported')
       }
-      ipcRenderer.sendToAll(tabId, `CHROME_RUNTIME_ONMESSAGE_${extensionId}`, message)
-    }
+      ipcRenderer.send('CHROME_RUNTIME_SENDMESSAGE', extensionId, message)
+    },
+
+    onUpdated: new Event()
   }
 
   chrome.extension = {

From 30dca2b4e16445f2f0c0c168d3920c882386f510 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 21:46:53 +0900
Subject: [PATCH 469/510] Pages in chrome extension should not have node
 integration

---
 lib/renderer/init.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index b0baf438c6c9..409d7d719f37 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -64,7 +64,7 @@ if (window.location.protocol === 'chrome-devtools:') {
 } else if (window.location.protocol === 'chrome-extension:') {
   // Add implementations of chrome API.
   require('./chrome-api').injectTo(window.location.hostname, window)
-  nodeIntegration = 'true'
+  nodeIntegration = 'false'
 } else {
   // Override default web functions.
   require('./override')

From f4fe60d126f9b86bca7dd7bfe99f49c81359cda5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 22:36:22 +0900
Subject: [PATCH 470/510] Set default mimeType for BufferJob

---
 atom/browser/net/url_request_buffer_job.cc | 23 ++++++++++++++++++++++
 lib/browser/chrome-extension.js            |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/atom/browser/net/url_request_buffer_job.cc b/atom/browser/net/url_request_buffer_job.cc
index c0c8e1584e69..c713099c76a1 100644
--- a/atom/browser/net/url_request_buffer_job.cc
+++ b/atom/browser/net/url_request_buffer_job.cc
@@ -8,10 +8,24 @@
 
 #include "atom/common/atom_constants.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
+#include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 
 namespace atom {
 
+namespace {
+
+std::string GetExtFromURL(const GURL& url) {
+  std::string spec = url.spec();
+  size_t index = spec.find_last_of('.');
+  if (index == std::string::npos || index == spec.size())
+    return std::string();
+  return spec.substr(index + 1, spec.size() - index - 1);
+}
+
+}  // namespace
+
 URLRequestBufferJob::URLRequestBufferJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate)
     : JsAsker<net::URLRequestSimpleJob>(request, network_delegate),
@@ -30,6 +44,15 @@ void URLRequestBufferJob::StartAsync(std::unique_ptr<base::Value> options) {
     options->GetAsBinary(&binary);
   }
 
+  if (mime_type_.empty()) {
+    std::string ext = GetExtFromURL(request()->url());
+#if defined(OS_WIN)
+    net::GetWellKnownMimeTypeFromExtension(base::UTF8ToUTF16(ext), &mime_type_);
+#else
+    net::GetWellKnownMimeTypeFromExtension(ext, &mime_type_);
+#endif
+  }
+
   if (!binary) {
     NotifyStartError(net::URLRequestStatus(
           net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 9cdebdba7d6c..609fdd6442bf 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -227,7 +227,7 @@ app.once('ready', function () {
       if (err) {
         return callback(-6)  // FILE_NOT_FOUND
       } else {
-        return callback({mimeType: 'text/html', data: content})
+        return callback(content)
       }
     })
   }

From f693b042b58a9c723261b5ee30c78706ef6e7e47 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 28 May 2016 22:46:15 +0900
Subject: [PATCH 471/510] Fix js lint warnings

---
 lib/renderer/api/ipc-renderer.js | 4 ++--
 lib/renderer/chrome-api.js       | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/renderer/api/ipc-renderer.js b/lib/renderer/api/ipc-renderer.js
index 1081475bbeac..66c40d311da2 100644
--- a/lib/renderer/api/ipc-renderer.js
+++ b/lib/renderer/api/ipc-renderer.js
@@ -20,7 +20,7 @@ ipcRenderer.sendToHost = function (...args) {
 
 ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
   if (typeof webContentsId !== 'number') {
-    throw new TypeError(`First argument has to be webContentsId`)
+    throw new TypeError('First argument has to be webContentsId')
   }
 
   ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', false, webContentsId, channel, ...args)
@@ -28,7 +28,7 @@ ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
 
 ipcRenderer.sendToAll = function (webContentsId, channel, ...args) {
   if (typeof webContentsId !== 'number') {
-    throw new TypeError(`First argument has to be webContentsId`)
+    throw new TypeError('First argument has to be webContentsId')
   }
 
   ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', true, webContentsId, channel, ...args)
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 19bf69f9a0df..e582f5f67876 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -119,14 +119,13 @@ exports.injectTo = function (extensionId, context) {
     sendMessage (...args) {
       // Parse the optional args.
       let targetExtensionId = extensionId
-      let message, options, responseCallback
+      let message
       if (args.length === 1) {
         message = args[0]
       } else if (args.length === 2) {
         [targetExtensionId, message] = args
       } else {
-        console.error('responseCallback is not supported')
-        [targetExtensionId, message, options, responseCallback] = args
+        console.error('options and responseCallback are not supported')
       }
 
       ipcRenderer.send('CHROME_RUNTIME_SENDMESSAGE', targetExtensionId, message)

From dd804d7432a8d5f95888c376306f4961d1afd808 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 May 2016 10:34:53 +0900
Subject: [PATCH 472/510] Enable specifying custom command line switches

---
 atom/browser/web_contents_preferences.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index ef9fc4df0b8c..a32e23de68f5 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -150,6 +150,16 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
     command_line->AppendSwitch(switches::kScrollBounce);
 #endif
 
+  // Custom command line switches.
+  const base::ListValue* args;
+  if (web_preferences.GetList("commandLineSwitches", &args)) {
+    for (size_t i = 0; i < args->GetSize(); ++i) {
+      std::string arg;
+      if (args->GetString(i, &arg) && !arg.empty())
+        command_line->AppendSwitch(arg);
+    }
+  }
+
   // Enable blink features.
   std::string blink_features;
   if (web_preferences.GetString(options::kBlinkFeatures, &blink_features))

From 2431d886bff43564653fb4968829f2cc6f675d7a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 May 2016 10:46:48 +0900
Subject: [PATCH 473/510] Current handle sender.tab for background pages

---
 lib/browser/chrome-extension.js          | 24 +++++++++++---
 lib/renderer/chrome-api.js               | 40 +++++++++++++++---------
 lib/renderer/content-scripts-injector.js |  2 +-
 lib/renderer/init.js                     |  9 ++++--
 4 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 609fdd6442bf..e81f4811c1e5 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -49,7 +49,9 @@ const startBackgroundPages = function (manifest) {
   }).join('')
   const html = new Buffer(`<html><body>${scripts}</body></html>`)
 
-  const contents = webContents.create({})
+  const contents = webContents.create({
+    commandLineSwitches: ['--background-page']
+  })
   backgroundPages[manifest.extensionId] = { html: html, webContents: contents }
   contents.loadURL(url.format({
     protocol: 'chrome-extension',
@@ -77,7 +79,7 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo)
   }
 
   const portId = ++nextId
-  event.returnValue = {webContentsId: page.webContents.id, portId: portId}
+  event.returnValue = {tabId: page.webContents.id, portId: portId}
 
   event.sender.once('render-view-deleted', () => {
     if (page.webContents.isDestroyed()) return
@@ -96,10 +98,22 @@ ipcMain.on('CHROME_RUNTIME_SENDMESSAGE', function (event, extensionId, message)
   page.webContents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, event.sender.id, message)
 })
 
-ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, webContentsId, extensionId, details) {
-  const contents = webContents.fromId(webContentsId)
+ipcMain.on('CHROME_TABS_SEND_MESSAGE', function (event, tabId, extensionId, isBackgroundPage, message) {
+  const contents = webContents.fromId(tabId)
   if (!contents) {
-    console.error(`Sending message to unkown webContentsId ${webContentsId}`)
+    console.error(`Sending message to unkown tab ${tabId}`)
+    return
+  }
+
+  const senderTabId = isBackgroundPage ? null : event.sender.id
+
+  contents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, senderTabId, message)
+})
+
+ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, tabId, extensionId, details) {
+  const contents = webContents.fromId(tabId)
+  if (!contents) {
+    console.error(`Sending message to unkown tab ${tabId}`)
     return
   }
 
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index e582f5f67876..4633adfcdffa 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -27,29 +27,29 @@ class Event {
 }
 
 class Tab {
-  constructor (webContentsId) {
-    this.id = webContentsId
+  constructor (tabId) {
+    this.id = tabId
   }
 }
 
 class MessageSender {
-  constructor (webContentsId, extensionId) {
-    this.tab = new Tab(webContentsId)
+  constructor (tabId, extensionId) {
+    this.tab = tabId ? new Tab(tabId) : null
     this.id = extensionId
     this.url = `chrome-extension://${extensionId}`
   }
 }
 
 class Port {
-  constructor (webContentsId, portId, extensionId, name) {
-    this.webContentsId = webContentsId
+  constructor (tabId, portId, extensionId, name) {
+    this.tabId = tabId
     this.portId = portId
     this.disconnected = false
 
     this.name = name
     this.onDisconnect = new Event()
     this.onMessage = new Event()
-    this.sender = new MessageSender(webContentsId, extensionId)
+    this.sender = new MessageSender(tabId, extensionId)
 
     ipcRenderer.once(`CHROME_PORT_DISCONNECT_${portId}`, () => {
       this._onDisconnect()
@@ -63,12 +63,12 @@ class Port {
   disconnect () {
     if (this.disconnected) return
 
-    ipcRenderer.sendToAll(this.webContentsId, `CHROME_PORT_DISCONNECT_${this.portId}`)
+    ipcRenderer.sendToAll(this.tabId, `CHROME_PORT_DISCONNECT_${this.portId}`)
     this._onDisconnect()
   }
 
   postMessage (message) {
-    ipcRenderer.sendToAll(this.webContentsId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
+    ipcRenderer.sendToAll(this.tabId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
   }
 
   _onDisconnect () {
@@ -79,11 +79,11 @@ class Port {
 }
 
 // Inject chrome API to the |context|
-exports.injectTo = function (extensionId, context) {
+exports.injectTo = function (extensionId, isBackgroundPage, context) {
   const chrome = context.chrome = context.chrome || {}
 
-  ipcRenderer.on(`CHROME_RUNTIME_ONCONNECT_${extensionId}`, (event, webContentsId, portId, connectInfo) => {
-    chrome.runtime.onConnect.emit(new Port(webContentsId, portId, extensionId, connectInfo.name))
+  ipcRenderer.on(`CHROME_RUNTIME_ONCONNECT_${extensionId}`, (event, tabId, portId, connectInfo) => {
+    chrome.runtime.onConnect.emit(new Port(tabId, portId, extensionId, connectInfo.name))
   })
 
   ipcRenderer.on(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, (event, tabId, message) => {
@@ -103,6 +103,11 @@ exports.injectTo = function (extensionId, context) {
     onConnect: new Event(),
 
     connect (...args) {
+      if (isBackgroundPage) {
+        console.error('chrome.runtime.connect is not supported in background page')
+        return
+      }
+
       // Parse the optional args.
       let targetExtensionId = extensionId
       let connectInfo = {name: ''}
@@ -112,11 +117,16 @@ exports.injectTo = function (extensionId, context) {
         [targetExtensionId, connectInfo] = args
       }
 
-      const {webContentsId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', targetExtensionId, connectInfo)
-      return new Port(webContentsId, portId, extensionId, connectInfo.name)
+      const {tabId, portId} = ipcRenderer.sendSync('CHROME_RUNTIME_CONNECT', targetExtensionId, connectInfo)
+      return new Port(tabId, portId, extensionId, connectInfo.name)
     },
 
     sendMessage (...args) {
+      if (isBackgroundPage) {
+        console.error('chrome.runtime.sendMessage is not supported in background page')
+        return
+      }
+
       // Parse the optional args.
       let targetExtensionId = extensionId
       let message
@@ -147,7 +157,7 @@ exports.injectTo = function (extensionId, context) {
       if (responseCallback) {
         console.error('responseCallback is not supported')
       }
-      ipcRenderer.send('CHROME_RUNTIME_SENDMESSAGE', extensionId, message)
+      ipcRenderer.send(`CHROME_TABS_SEND_MESSAGE`, tabId, extensionId, isBackgroundPage, message)
     },
 
     onUpdated: new Event()
diff --git a/lib/renderer/content-scripts-injector.js b/lib/renderer/content-scripts-injector.js
index 80115a6c5394..e4a801110f62 100644
--- a/lib/renderer/content-scripts-injector.js
+++ b/lib/renderer/content-scripts-injector.js
@@ -13,7 +13,7 @@ const matchesPattern = function (pattern) {
 // Run the code with chrome API integrated.
 const runContentScript = function (extensionId, url, code) {
   const context = {}
-  require('./chrome-api').injectTo(extensionId, context)
+  require('./chrome-api').injectTo(extensionId, false, context)
   const wrapper = `(function (chrome) {\n  ${code}\n  })`
   const compiledWrapper = runInThisContext(wrapper, {
     filename: url,
diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index 409d7d719f37..f0875cae12c2 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -41,8 +41,9 @@ electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (ev
 })
 
 // Process command line arguments.
-var nodeIntegration = 'false'
-var preloadScript = null
+let nodeIntegration = 'false'
+let preloadScript = null
+let isBackgroundPage = false
 for (let arg of process.argv) {
   if (arg.indexOf('--guest-instance-id=') === 0) {
     // This is a guest web view.
@@ -54,6 +55,8 @@ for (let arg of process.argv) {
     nodeIntegration = arg.substr(arg.indexOf('=') + 1)
   } else if (arg.indexOf('--preload=') === 0) {
     preloadScript = arg.substr(arg.indexOf('=') + 1)
+  } else if (arg === '--background-page') {
+    isBackgroundPage = true
   }
 }
 
@@ -63,7 +66,7 @@ if (window.location.protocol === 'chrome-devtools:') {
   nodeIntegration = 'true'
 } else if (window.location.protocol === 'chrome-extension:') {
   // Add implementations of chrome API.
-  require('./chrome-api').injectTo(window.location.hostname, window)
+  require('./chrome-api').injectTo(window.location.hostname, isBackgroundPage, window)
   nodeIntegration = 'false'
 } else {
   // Override default web functions.

From ec1944c1464ebe67844423efcf7ab9404356aa67 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 May 2016 11:50:14 +0900
Subject: [PATCH 474/510] Implement chrome.tab.onCreated/onRemoved APIs

---
 lib/browser/chrome-extension.js | 15 +++++++++++++++
 lib/renderer/chrome-api.js      | 18 ++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index e81f4811c1e5..233f7f1ce8b5 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -68,6 +68,20 @@ const removeBackgroundPages = function (manifest) {
   delete backgroundPages[manifest.extensionId]
 }
 
+// Dispatch tabs events.
+const hookWindowForTabEvents = function (win) {
+  const tabId = win.webContents.id
+  for (const page of objectValues(backgroundPages)) {
+    page.webContents.sendToAll('CHROME_TABS_ONCREATED', tabId)
+  }
+
+  win.once('closed', () => {
+    for (const page of objectValues(backgroundPages)) {
+      page.webContents.sendToAll('CHROME_TABS_ONREMOVED', tabId)
+    }
+  })
+}
+
 // Handle the chrome.* API messages.
 let nextId = 0
 
@@ -290,6 +304,7 @@ app.once('ready', function () {
   const init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)
+    hookWindowForTabEvents(this)
     this.webContents.on('devtools-opened', () => {
       loadDevToolsExtensions(this, objectValues(manifestMap))
     })
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 4633adfcdffa..a7a216da2aa1 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -90,6 +90,14 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
     chrome.runtime.onMessage.emit(message, new MessageSender(tabId, extensionId))
   })
 
+  ipcRenderer.on('CHROME_TABS_ONCREATED', (event, tabId) => {
+    chrome.tabs.onCreated.emit(new Tab(tabId))
+  })
+
+  ipcRenderer.on('CHROME_TABS_ONREMOVED', (event, tabId) => {
+    chrome.tabs.onRemoved.emit(tabId)
+  })
+
   chrome.runtime = {
     getURL: function (path) {
       return url.format({
@@ -100,8 +108,6 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
       })
     },
 
-    onConnect: new Event(),
-
     connect (...args) {
       if (isBackgroundPage) {
         console.error('chrome.runtime.connect is not supported in background page')
@@ -141,7 +147,9 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
       ipcRenderer.send('CHROME_RUNTIME_SENDMESSAGE', targetExtensionId, message)
     },
 
-    onMessage: new Event()
+    onConnect: new Event(),
+    onMessage: new Event(),
+    onInstalled: new Event()
   }
 
   chrome.tabs = {
@@ -160,7 +168,9 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
       ipcRenderer.send(`CHROME_TABS_SEND_MESSAGE`, tabId, extensionId, isBackgroundPage, message)
     },
 
-    onUpdated: new Event()
+    onUpdated: new Event(),
+    onCreated: new Event(),
+    onRemoved: new Event()
   }
 
   chrome.extension = {

From de001a9bbfa85e2e00cd0d460017cf5ccf6f79b2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 May 2016 11:57:20 +0900
Subject: [PATCH 475/510] Use meaningful name for extensionId

---
 lib/browser/chrome-extension.js | 8 +++++---
 lib/renderer/chrome-api.js      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 233f7f1ce8b5..775a31d2d03e 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -14,13 +14,16 @@ const objectValues = function (object) {
 const manifestMap = {}  // extensionId => manifest
 const manifestNameMap = {}  // name => manifest
 
-let nextExtensionId = 0
+const generateExtensionIdFromName = function (name) {
+  return name.replace(/[\W_]+/g, '-').toLowerCase()
+}
 
 // Create or get manifest object from |srcDirectory|.
 const getManifestFromPath = function (srcDirectory) {
   const manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
   if (!manifestNameMap[manifest.name]) {
-    const extensionId = `extension-${++nextExtensionId}`
+    const extensionId = generateExtensionIdFromName(manifest.name)
+    console.log(extensionId)
     manifestMap[extensionId] = manifestNameMap[manifest.name] = manifest
     Object.assign(manifest, {
       srcDirectory: srcDirectory,
@@ -238,7 +241,6 @@ app.once('ready', function () {
   const chromeExtensionHandler = function (request, callback) {
     const parsed = url.parse(request.url)
     if (!parsed.hostname || !parsed.path) return callback()
-    if (!/extension-\d+/.test(parsed.hostname)) return callback()
 
     const manifest = manifestMap[parsed.hostname]
     if (!manifest) return callback()
diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index a7a216da2aa1..61fce14c5ba9 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -165,7 +165,7 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
       if (responseCallback) {
         console.error('responseCallback is not supported')
       }
-      ipcRenderer.send(`CHROME_TABS_SEND_MESSAGE`, tabId, extensionId, isBackgroundPage, message)
+      ipcRenderer.send('CHROME_TABS_SEND_MESSAGE', tabId, extensionId, isBackgroundPage, message)
     },
 
     onUpdated: new Event(),

From 5f3fdbe6354a8efc46b2d74083534ff589031c41 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 May 2016 12:10:32 +0900
Subject: [PATCH 476/510] Simplify the implementation of sendToAll

---
 atom/browser/api/atom_api_web_contents.cc | 11 +++--------
 atom/browser/api/atom_api_web_contents.h  |  5 ++---
 lib/browser/api/web-contents.js           | 13 ++++---------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 9f447f8e34e4..736fb7ca0fb1 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -1088,14 +1088,10 @@ void WebContents::TabTraverse(bool reverse) {
   web_contents()->FocusThroughTabTraversal(reverse);
 }
 
-bool WebContents::SendIPCMessage(const base::string16& channel,
+bool WebContents::SendIPCMessage(bool all_frames,
+                                 const base::string16& channel,
                                  const base::ListValue& args) {
-  return Send(new AtomViewMsg_Message(routing_id(), false, channel, args));
-}
-
-bool WebContents::SendIPCMessageToAll(const base::string16& channel,
-                                      const base::ListValue& args) {
-  return Send(new AtomViewMsg_Message(routing_id(), true, channel, args));
+  return Send(new AtomViewMsg_Message(routing_id(), all_frames, channel, args));
 }
 
 void WebContents::SendInputEvent(v8::Isolate* isolate,
@@ -1263,7 +1259,6 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("focus", &WebContents::Focus)
       .SetMethod("tabTraverse", &WebContents::TabTraverse)
       .SetMethod("_send", &WebContents::SendIPCMessage)
-      .SetMethod("_sendToAll", &WebContents::SendIPCMessageToAll)
       .SetMethod("sendInputEvent", &WebContents::SendInputEvent)
       .SetMethod("beginFrameSubscription",
                  &WebContents::BeginFrameSubscription)
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index 7f90c33ea8f0..e03ab653a8ce 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -122,10 +122,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
   void TabTraverse(bool reverse);
 
   // Send messages to browser.
-  bool SendIPCMessage(const base::string16& channel,
+  bool SendIPCMessage(bool all_frames,
+                      const base::string16& channel,
                       const base::ListValue& args);
-  bool SendIPCMessageToAll(const base::string16& channel,
-                           const base::ListValue& args);
 
   // Send WebInputEvent to the page.
   void SendInputEvent(v8::Isolate* isolate, v8::Local<v8::Value> input_event);
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 1b601f095dbb..0f79a185ffc9 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -71,20 +71,15 @@ let wrapWebContents = function (webContents) {
   webContents.setMaxListeners(0)
 
   // WebContents::send(channel, args..)
-  webContents.send = function (channel, ...args) {
-    if (channel == null) {
-      throw new Error('Missing required channel argument')
-    }
-    return this._send(channel, args)
-  }
-
   // WebContents::sendToAll(channel, args..)
-  webContents.sendToAll = function (channel, ...args) {
+  const sendWrapper = (allFrames, channel, ...args) => {
     if (channel == null) {
       throw new Error('Missing required channel argument')
     }
-    return this._sendToAll(channel, args)
+    return webContents._send(allFrames, channel, args)
   }
+  webContents.send = sendWrapper.bind(null, false)
+  webContents.sendToAll = sendWrapper.bind(null, true)
 
   // The navigation controller.
   controller = new NavigationController(webContents)

From d1e56f416ce75059d2bb80d3ea7138d32d091c86 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 May 2016 15:19:41 +0900
Subject: [PATCH 477/510] Update the docs on using DevTools extension

---
 docs/tutorial/devtools-extension.md | 84 +++++++++++++----------------
 1 file changed, 37 insertions(+), 47 deletions(-)

diff --git a/docs/tutorial/devtools-extension.md b/docs/tutorial/devtools-extension.md
index 1791c0459207..f004b1f31127 100644
--- a/docs/tutorial/devtools-extension.md
+++ b/docs/tutorial/devtools-extension.md
@@ -1,62 +1,52 @@
 # DevTools Extension
 
-To make debugging easier, Electron has basic support for the
-[Chrome DevTools Extension][devtools-extension].
+Electron supports the [Chrome DevTools Extension][devtools-extension], which can
+be used to extend the ability of devtools for debugging popular web frameworks.
 
-For most DevTools extensions you can simply download the source code and use
-the `BrowserWindow.addDevToolsExtension` API to load them. The loaded extensions
-will be remembered so you don't need to call the API every time when creating
-a window.
+## How to load a DevTools Extension
 
-** NOTE: React DevTools does not work, follow the issue here https://github.com/electron/electron/issues/915 **
+To load an extension in Electron, you need to download it in Chrome browser,
+locate its filesystem path, and then load it by calling the
+`BrowserWindow.addDevToolsExtension(extension)` API.
 
-For example, to use the [React DevTools Extension](https://github.com/facebook/react-devtools)
-, first you need to download its source code:
+Using the [React Developer Tools][react-devtools] as example:
 
-```bash
-$ cd /some-directory
-$ git clone --recursive https://github.com/facebook/react-devtools.git
-```
+1. Install it in Chrome browser.
+1. Navigate to `chrome://extensions`, and find its extension ID, which is a hash
+   string like `fmkadmapgofadopljbjfkapdkoienihi`.
+1. Find out filesystem location used by Chrome for storing extensions:
+   * on Windows it is `%LOCALAPPDATA%\Google\Chrome\User Data\Default\Extensions`;
+   * on Linux it is `~/.config/google-chrome/Default/Extensions/`;
+   * on OS X it is `~/Library/Application Support/Google/Chrome/Default/Extensions`.
+1. Pass the location of the extension to `BrowserWindow.addDevToolsExtension`
+   API, for the React Developer Tools, it is something like:
+   `~/Library/Application Support/Google/Chrome/Default/Extensions/fmkadmapgofadopljbjfkapdkoienihi/0.14.10_0`
 
-Follow the instructions in [`react-devtools/shells/chrome/Readme.md`](https://github.com/facebook/react-devtools/blob/master/shells/chrome/Readme.md) to build the extension.
+The name of the extension is returned by `BrowserWindow.addDevToolsExtension`,
+and you can pass the name of the extension to the `BrowserWindow.removeDevToolsExtension`
+API to unload it.
 
-Then you can load the extension in Electron by opening DevTools in any window,
-and running the following code in the DevTools console:
+## Supported DevTools Extensions
 
-```javascript
-const BrowserWindow = require('electron').remote.BrowserWindow;
-BrowserWindow.addDevToolsExtension('/some-directory/react-devtools/shells/chrome');
-```
+Electron only supports a limited set of `chrome.*` APIs, so some extensions
+using unsupported `chrome.*` APIs for chrome extension features may not work.
+Following Devtools Extensions are tested and guaranteed to work in Electron:
 
-To unload the extension, you can call the `BrowserWindow.removeDevToolsExtension`
-API with its name and it will not load the next time you open the DevTools:
+* [Ember Inspector](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
+* [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi)
+* [Backbone Debugger](https://chrome.google.com/webstore/detail/backbone-debugger/bhljhndlimiafopmmhjlgfpnnchjjbhd)
+* [jQuery Debugger](https://chrome.google.com/webstore/detail/jquery-debugger/dbhhnnnpaeobfddmlalhnehgclcmjimi)
+* [AngularJS Batarang](https://chrome.google.com/webstore/detail/angularjs-batarang/ighdmehidhipcmcojjgiloacoafjmpfk)
+* [Vue.js devtools](https://chrome.google.com/webstore/detail/vuejs-devtools/nhdogjmejiglipccpnnnanhbledajbpd)
 
-```javascript
-BrowserWindow.removeDevToolsExtension('React Developer Tools');
-```
+### What should I do if a DevTools Extension is not working?
 
-## Format of DevTools Extension
+Fist please make sure the extension is still being maintained, some extensions
+can not even work for recent versions of Chrome browser, and we are not able to
+do anything for them.
 
-Ideally all DevTools extensions written for the Chrome browser can be loaded by
-Electron, but they have to be in a plain directory. For those packaged with
-`crx` extensions, there is no way for Electron to load them unless you find a
-way to extract them into a directory.
-
-## Background Pages
-
-Currently Electron doesn't support the background pages feature in Chrome
-extensions, so some DevTools extensions that rely on this feature may
-not work in Electron.
-
-## `chrome.*` APIs
-
-Some Chrome extensions may use `chrome.*` APIs for features and while there has
-been some effort to implement those APIs in Electron, not all have been
-implemented.
-
-Given that not all `chrome.*` APIs are implemented if the DevTools extension is
-using APIs other than `chrome.devtools.*`, the extension is very likely not to
-work. You can report failing extensions in the issue tracker so that we can add
-support for those APIs.
+Then file a bug at Electron's issues list, and describe which part of the
+extension is not working as expected.
 
 [devtools-extension]: https://developer.chrome.com/extensions/devtools
+[react-devtools]: https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi

From 23fbb57d729bd4e3a342313f5ca1e1e2f32bd8c9 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 29 May 2016 13:17:31 +0530
Subject: [PATCH 478/510] protocol: store response data when reader is not
 ready

---
 atom/browser/net/url_request_fetch_job.cc | 56 ++++++++++++++++++-----
 atom/browser/net/url_request_fetch_job.h  |  9 +++-
 2 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/atom/browser/net/url_request_fetch_job.cc b/atom/browser/net/url_request_fetch_job.cc
index b6aadc89ec62..388b9f9550b3 100644
--- a/atom/browser/net/url_request_fetch_job.cc
+++ b/atom/browser/net/url_request_fetch_job.cc
@@ -59,7 +59,7 @@ class ResponsePiper : public net::URLFetcherResponseWriter {
       job_->HeadersCompleted();
       first_write_ = false;
     }
-    return job_->DataAvailable(buffer, num_bytes);
+    return job_->DataAvailable(buffer, num_bytes, callback);
   }
   int Finish(const net::CompletionCallback& callback) override {
     return net::OK;
@@ -166,21 +166,23 @@ void URLRequestFetchJob::HeadersCompleted() {
   NotifyHeadersComplete();
 }
 
-int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer, int num_bytes) {
-  // Do nothing if pending_buffer_ is empty, i.e. there's no ReadRawData()
-  // operation waiting for IO completion.
-  if (!pending_buffer_.get())
+int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
+                                      int num_bytes,
+                                      const net::CompletionCallback& callback) {
+  // Store the data in a drainable IO buffer if pending_buffer_ is empty, i.e.
+  // there's no ReadRawData() operation waiting for IO completion.
+  if (!pending_buffer_.get()) {
+    response_piper_callback_ = callback;
+    drainable_buffer_ = new net::DrainableIOBuffer(buffer, num_bytes);
     return net::ERR_IO_PENDING;
+  }
 
   // pending_buffer_ is set to the IOBuffer instance provided to ReadRawData()
   // by URLRequestJob.
   int bytes_read = std::min(num_bytes, pending_buffer_size_);
   memcpy(pending_buffer_->data(), buffer->data(), bytes_read);
 
-  // Clear the buffers before notifying the read is complete, so that it is
-  // safe for the observer to read.
-  pending_buffer_ = nullptr;
-  pending_buffer_size_ = 0;
+  ClearPendingBuffer();
 
   ReadRawDataComplete(bytes_read);
   return bytes_read;
@@ -191,6 +193,35 @@ void URLRequestFetchJob::Kill() {
   fetcher_.reset();
 }
 
+void URLRequestFetchJob::StartReading() {
+  if (drainable_buffer_.get()) {
+    auto num_bytes = drainable_buffer_->BytesRemaining();
+    if (num_bytes <= 0 && !response_piper_callback_.is_null()) {
+      int size = drainable_buffer_->BytesConsumed();
+      drainable_buffer_ = nullptr;
+      response_piper_callback_.Run(size);
+      response_piper_callback_.Reset();
+      return;
+    }
+
+    int bytes_read = std::min(num_bytes, pending_buffer_size_);
+    memcpy(pending_buffer_->data(), drainable_buffer_->data(), bytes_read);
+
+    drainable_buffer_->DidConsume(bytes_read);
+
+    ClearPendingBuffer();
+
+    ReadRawDataComplete(bytes_read);
+  }
+}
+
+void URLRequestFetchJob::ClearPendingBuffer() {
+  // Clear the buffers before notifying the read is complete, so that it is
+  // safe for the observer to read.
+  pending_buffer_ = nullptr;
+  pending_buffer_size_ = 0;
+}
+
 int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
   if (GetResponseCode() == 204) {
     request()->set_received_response_content_length(prefilter_bytes_read());
@@ -198,6 +229,9 @@ int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
   }
   pending_buffer_ = dest;
   pending_buffer_size_ = dest_size;
+  // Read from drainable_buffer_ if available, i.e. response data became
+  // available before ReadRawData was called.
+  StartReading();
   return net::ERR_IO_PENDING;
 }
 
@@ -229,8 +263,8 @@ void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
     return;
   }
 
-  pending_buffer_ = nullptr;
-  pending_buffer_size_ = 0;
+  ClearPendingBuffer();
+
   if (fetcher_->GetStatus().is_success())
     ReadRawDataComplete(0);
   else
diff --git a/atom/browser/net/url_request_fetch_job.h b/atom/browser/net/url_request_fetch_job.h
index 65d73f27ca94..da1c1678e58a 100644
--- a/atom/browser/net/url_request_fetch_job.h
+++ b/atom/browser/net/url_request_fetch_job.h
@@ -25,9 +25,14 @@ class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
 
   // Called by response writer.
   void HeadersCompleted();
-  int DataAvailable(net::IOBuffer* buffer, int num_bytes);
+  int DataAvailable(net::IOBuffer* buffer,
+                    int num_bytes,
+                    const net::CompletionCallback& callback);
 
  protected:
+  void StartReading();
+  void ClearPendingBuffer();
+
   // JsAsker:
   void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) override;
   void StartAsync(std::unique_ptr<base::Value> options) override;
@@ -46,8 +51,10 @@ class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   std::unique_ptr<net::URLFetcher> fetcher_;
   scoped_refptr<net::IOBuffer> pending_buffer_;
+  scoped_refptr<net::DrainableIOBuffer> drainable_buffer_;
   int pending_buffer_size_;
   std::unique_ptr<net::HttpResponseInfo> response_info_;
+  net::CompletionCallback response_piper_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestFetchJob);
 };

From 9d8af43617ed1dcdf3efc7121c3a916713805304 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 29 May 2016 13:43:26 +0530
Subject: [PATCH 479/510] add spec

---
 spec/api-protocol-spec.js | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
index 2a1d158c3dfd..1b46d586a41a 100644
--- a/spec/api-protocol-spec.js
+++ b/spec/api-protocol-spec.js
@@ -3,8 +3,7 @@ const http = require('http')
 const path = require('path')
 const qs = require('querystring')
 const remote = require('electron').remote
-const BrowserWindow = remote.require('electron').BrowserWindow
-const protocol = remote.require('electron').protocol
+const {BrowserWindow, protocol, webContents} = remote
 
 describe('protocol module', function () {
   var protocolName = 'sp'
@@ -511,6 +510,42 @@ describe('protocol module', function () {
         })
       })
     })
+
+    it('loads resource for webContents', function (done) {
+      var contents = null
+      var server = http.createServer(function (req, res) {
+        if (req.url == '/serverRedirect') {
+          res.statusCode = 301
+          res.setHeader('Location', 'http://' + req.rawHeaders[1])
+          res.end()
+        } else {
+          res.end(text)
+        }
+      })
+      server.listen(0, '127.0.0.1', function () {
+        var port = server.address().port
+        var url = `${protocolName}://fake-host`
+        var redirectURL = `http://127.0.0.1:${port}/serverRedirect`
+        var handler = function (request, callback) {
+          callback({
+            url: redirectURL
+          })
+        }
+        protocol.registerHttpProtocol(protocolName, handler, function (error) {
+          if (error) {
+            return done(error)
+          }
+          contents = webContents.create({})
+          contents.on('did-finish-load', function () {
+            assert.equal(contents.getURL(), url)
+            server.close()
+            contents.destroy()
+            done()
+          })
+          contents.loadURL(url)
+        })
+      })
+    })
   })
 
   describe('protocol.isProtocolHandled', function () {

From 34af9794a2e595b5da814e89e35bea1ec9dc21ff Mon Sep 17 00:00:00 2001
From: Daniel Pham <pham.dany@gmail.com>
Date: Sun, 29 May 2016 08:47:42 -0400
Subject: [PATCH 480/510] :white_check_mark: Add test for 'setAspectRatio(0)'

---
 spec/api-browser-window-spec.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 3b1ccabaae59..8af2fb826574 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -284,6 +284,21 @@ describe('browser-window module', function () {
     })
   })
 
+  describe('BrowserWindow.setAspectRatio(ratio)', function () {
+    it('resets the behaviour when passing in 0', function (done) {
+      var size = [300, 400]
+      w.setAspectRatio(1/2)
+      w.setAspectRatio(0)
+      w.once('resize', function () {
+        var newSize = w.getSize()
+        assert.equal(newSize[0], size[0])
+        assert.equal(newSize[1], size[1])
+        done()
+      })
+      w.setSize(size[0], size[1])
+    })
+  })
+
   describe('BrowserWindow.setPosition(x, y)', function () {
     it('sets the window position', function (done) {
       var pos = [10, 10]

From 09796587b495eaf3e8eb7d301fa4cd56f27fda2a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 09:12:16 +0900
Subject: [PATCH 481/510] Remove trailing whitespaces and cleanup the code
 logic

---
 atom/browser/native_window.cc | 10 ++++------
 docs/api/browser-window.md    |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index d73433adfdb2..c22159fc25db 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -137,16 +137,14 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   if (options.Get(options::kAlwaysOnTop, &top) && top) {
     SetAlwaysOnTop(true);
   }
-  // Disable fullscreen button if 'fullscreen' is specified to false.
   bool fullscreenable = true;
   bool fullscreen = false;
-  if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen)
+  if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen) {
+    // Disable fullscreen button if 'fullscreen' is specified to false.
+  #if defined(OS_MACOSX)
     fullscreenable = false;
-  // On Windows, we can only enter fullscreen via API
-  // Ensure that setFullscreen(true) is usable by default
-  #if defined(OS_WIN)
-    fullscreenable = true;
   #endif
+  }
   // Overriden by 'fullscreenable'.
   options.Get(options::kFullScreenable, &fullscreenable);
   SetFullScreenable(fullscreenable);
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index be70ef8f198d..ecdbece771b7 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -59,8 +59,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `fullscreen` Boolean - Whether the window should show in fullscreen. When
     explicitly set to `false` the fullscreen button will be hidden or disabled
     on OS X. Default is `false`.
-  * `fullscreenable` Boolean - Whether the window can be put into fullscreen 
-    mode. On OS X, also whether the maximize/zoom button should toggle full 
+  * `fullscreenable` Boolean - Whether the window can be put into fullscreen
+    mode. On OS X, also whether the maximize/zoom button should toggle full
     screen mode or maximize window. Default is `true`.
   * `skipTaskbar` Boolean - Whether to show the window in taskbar. Default is
     `false`.

From 5a9eb5cfa6700bb532ea9dcb2ab9b0b087fde6b9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 09:46:42 +0900
Subject: [PATCH 482/510] Choose the correct icon size for Windows taskbar

---
 atom/browser/api/atom_api_window.cc | 3 ++-
 docs/api/native-image.md            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 122c5a68624d..ac3c510193ed 100644
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -633,7 +633,8 @@ void Window::ShowDefinitionForSelection() {
 void Window::SetIcon(mate::Handle<NativeImage> icon) {
 #if defined(OS_WIN)
   static_cast<NativeWindowViews*>(window_.get())->SetIcon(
-      icon->GetHICON(GetSystemMetrics(SM_CXSMICON)), icon->GetHICON(256));
+      icon->GetHICON(GetSystemMetrics(SM_CXSMICON)),
+      icon->GetHICON(GetSystemMetrics(SM_CXICON)));
 #elif defined(USE_X11)
   static_cast<NativeWindowViews*>(window_.get())->SetIcon(
       icon->image().AsImageSkia());
diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index 9790daaca49e..5244b71dfb16 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -30,6 +30,7 @@ effects it is recommended to include at least followings sizes in the icon:
 
 * 16x16
 * 32x32
+* 64x64
 * 256x256
 
 ## High Resolution Image

From 7ec467e337391efec3ac0abde1b9051675914323 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 10:37:02 +0900
Subject: [PATCH 483/510] docs: Move the "Packaging Tools" out of "Rebranding"
 chapter

---
 docs/tutorial/application-distribution.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index c8ec1f6d09b6..4d3e12db75fc 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -102,6 +102,14 @@ MyApp.app/Contents
 
 You can rename the `electron` executable to any name you like.
 
+## Packaging Tools
+
+Apart from packaging your app manually, you can also choose to use third party
+packaging tools to do the work for you:
+
+* [electron-packager](https://github.com/maxogden/electron-packager)
+* [electron-builder](https://github.com/loopline-systems/electron-builder)
+
 ## Rebranding by Rebuilding Electron from Source
 
 It is also possible to rebrand Electron by changing the product name and
@@ -118,14 +126,6 @@ This task will automatically handle editing the `.gyp` file, building from
 source, then rebuilding your app's native Node modules to match the new
 executable name.
 
-## Packaging Tools
-
-Apart from packaging your app manually, you can also choose to use third party
-packaging tools to do the work for you:
-
-* [electron-packager](https://github.com/maxogden/electron-packager)
-* [electron-builder](https://github.com/loopline-systems/electron-builder)
-
 ### Creating a Custom Electron Fork
 
 Creating a custom fork of Electron is almost certainly not something you will

From 12631a18c045d525abe3f891f03f1276daaa72b5 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Mon, 30 May 2016 13:45:48 +0900
Subject: [PATCH 484/510] :memo: Japanese: add web-view-tag.md

---
 docs-translations/jp/README.md           |   2 +-
 docs-translations/jp/api/file-object.md  |  12 +-
 docs-translations/jp/api/web-view-tag.md | 745 +++++++++++++++++++++++
 3 files changed, 753 insertions(+), 6 deletions(-)
 create mode 100644 docs-translations/jp/api/web-view-tag.md

diff --git a/docs-translations/jp/README.md b/docs-translations/jp/README.md
index 5b3802e93d66..7359745d6c0b 100644
--- a/docs-translations/jp/README.md
+++ b/docs-translations/jp/README.md
@@ -44,7 +44,7 @@ _リンクになっていないリストは未翻訳のものです。_
 ### カスタムDOM要素:
 
 * [`File` Object](api/file-object.md)
-* `<webview>` Tag api/web-view-tag.md
+* [`<webview>` タグ](api/web-view-tag.md)
 * [`window.open` 関数](api/window-open.md)
 
 ### Main Processのモジュール:
diff --git a/docs-translations/jp/api/file-object.md b/docs-translations/jp/api/file-object.md
index 2e497def56b4..ec2724cff1d2 100644
--- a/docs-translations/jp/api/file-object.md
+++ b/docs-translations/jp/api/file-object.md
@@ -1,5 +1,7 @@
 # `File` object
 
+> ファイルシステム上のファイルを扱うには、HTML5のFile APIを使用します。
+
 DOMのファイルインターフェイスにより、ユーザーはHTML 5 ファイルAPIで直接、ネイティブファイルで作業できるように、ネイティブファイル周りの抽象化を提供します。Electronは、ファイルシステム上のファイルの実際のパスを公開する`File`インターフェイスの`path`属性を追加します。
 
 アプリ上にドラッグしたファイルの実際のパスを取得する例:
@@ -10,16 +12,16 @@ DOMのファイルインターフェイスにより、ユーザーはHTML 5 フ
 </div>
 
 <script>
-  var holder = document.getElementById('holder');
-  holder.ondragover = function () {
+  const holder = document.getElementById('holder');
+  holder.ondragover = () => {
     return false;
   };
-  holder.ondragleave = holder.ondragend = function () {
+  holder.ondragleave = holder.ondragend = () => {
     return false;
   };
-  holder.ondrop = function (e) {
+  holder.ondrop = (e) => {
     e.preventDefault();
-    var file = e.dataTransfer.files[0];
+    const file = e.dataTransfer.files[0];
     console.log('File you dragged here is', file.path);
     return false;
   };
diff --git a/docs-translations/jp/api/web-view-tag.md b/docs-translations/jp/api/web-view-tag.md
new file mode 100644
index 000000000000..e70f84f2d258
--- /dev/null
+++ b/docs-translations/jp/api/web-view-tag.md
@@ -0,0 +1,745 @@
+# `<webview>` タグ
+
+> 外部ウェブコンテンツを別のプロセスとフレームで表示します。
+
+Electronアプリ内でウェブページのような外部コンテンツを埋め込む際は、`webview`タグを使用してください。外部コンテンツは`webview`コンテナ内に閉じ込められます。
+アプリケーションの埋め込みページは、外部コンテンツがどのように表示されるかを制御することができます。
+
+`iframe`と違い、`webview`はあなたのアプリと別のプロセスで動作します。あなたのウェブページとは違う実行許可レベルを持っており、あなたのアプリと埋め込みコンテンツの間のデータのやり取りは非同期で行われます。これにより、あなたのアプリケーションは埋め込みコンテンツからの安全が確保されます。
+
+セキュリティ的な理由で、`webview`は`nodeIntegration`が有効な`BrowserWindow`でしか使用できません。
+
+## 例
+
+ウェブページをあなたのアプリに埋め込むには、`webview`タグをあなたの埋め込みページ(外部コンテンツを表示するアプリのページ)に追加してください。
+もっとも単純な方法では、`webview`タグはウェブページの`src`と、見た目を制御する`style`を持っています。
+
+```html
+<webview id="foo" src="https://www.github.com/" style="display:inline-flex; width:640px; height:480px"></webview>
+```
+
+もし、外部コンテンツを制御したい場合、`webview`イベントを受け取り、`webview`メソッドでそれらのイベントに返答するJavaScriptコードを書くことになります。
+下記にあるのはウェブページの読み込みが開始した時と、止まった時にイベントを受け取るサンプルで、読み込み中に"loading..."というメッセージを表示します。
+
+```html
+<script>
+  onload = () => {
+    const webview = document.getElementById('foo');
+    const indicator = document.querySelector('.indicator');
+
+    const loadstart = () => {
+      indicator.innerText = 'loading...';
+    };
+
+    const loadstop = () => {
+      indicator.innerText = '';
+    };
+
+    webview.addEventListener('did-start-loading', loadstart);
+    webview.addEventListener('did-stop-loading', loadstop);
+  };
+</script>
+```
+
+## CSS Styling Notes
+
+もし、flexbox layouts(v.0.36.11以降)を使用する場合は、`webview`タグは子`object`要素が`webview`自体の高さと幅いっぱいとなるよう、内部で`display: flex;`を使用しているのに注意してください。
+インラインレイアウトとしたい時に`display: inline-flex;`を指定する以外には、この`display: flex;`は上書きしないでください。
+
+`webview`は`hidden`属性か、`display: none;`と使用して非表示にする際に、いくつか問題があります。
+`browserplugin`オブジェクトの中での描画や、ウェブページを再度表示するために再読み込みした際などに通常とは異なる描画となる場合があります。
+`webview`を隠すオススメの方法としては、`width`と`height`をゼロに設定し、`flex`を通じて、0pxまで小さくできるようにします。
+
+```html
+<style>
+  webview {
+    display:inline-flex;
+    width:640px;
+    height:480px;
+  }
+  webview.hide {
+    flex: 0 1;
+    width: 0px;
+    height: 0px;
+  }
+</style>
+```
+
+## Tag 属性
+
+`webview`タグは下記のような属性を持っています：
+
+### `src`
+
+```html
+<webview src="https://www.github.com/"></webview>
+```
+
+表示されているURLを返します。本属性への書き込みは、トップレベルナビゲーションを開始させます。
+
+`src`の値を現在の値に再度設定することで、現在のページを再読み込みさせることができます。
+
+また、`src`属性はdata URLを指定することができます(例: `data:text/plain,Hello, world!`)。
+
+### `autosize`
+
+```html
+<webview src="https://www.github.com/" autosize="on" minwidth="576" minheight="432"></webview>
+```
+
+"on"の際は、`minwidth`, `minheight`, `maxwidth`, `maxheight`で設定された範囲内で、自動的に大きさが変化します。
+これらの制限値は、`autosize`が有効でない場合は影響しません。
+`autosize`が有効の際は、`webview`コンテナサイズは指定した最小値より小さくなりませんし、最大値より大きくなりません。
+
+### `nodeintegration`
+
+```html
+<webview src="http://www.google.com/" nodeintegration></webview>
+```
+
+"on"の際は、`webview`内のゲストページ(外部コンテンツ)でnode integrationが有効となり、`require`や`process`と行ったnode APIでシステムリソースにアクセスできるようになります。1
+
+**注意:** 親ウィンドウでnode integrationが無効の場合は、`webview`でも常に無効になります。
+
+
+### `plugins`
+
+```html
+<webview src="https://www.github.com/" plugins></webview>
+```
+
+"on"の際は、ゲストページはブラウザプラグインを使用できます。
+
+### `preload`
+
+```html
+<webview src="https://www.github.com/" preload="./test.js"></webview>
+```
+
+ゲストページ上のスクリプトより先に実行されるスクリプトを指定してください。内部では、ゲストページ内で`require`で読み込まれるので、スクリプトのURLのプロトコルはは`file:`または`asar:`でなければなりません。
+
+ゲストページがnode integrationが無効の場合でも、このスクリプトは全てのNode APIにアクセスできます。ただし、グローバルオブジェクトはこのスクリプトの実行終了後にすべて削除されます。
+
+### `httpreferrer`
+
+```html
+<webview src="https://www.github.com/" httpreferrer="http://cheng.guru"></webview>
+```
+
+ゲストページのためにリファラを設定します。
+
+### `useragent`
+
+```html
+<webview src="https://www.github.com/" useragent="Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko"></webview>
+```
+
+ページ遷移の前に、User agentを指定します。すでにページが読み込まれている場合は、`setUserAgent`メソッドを利用して変更してください。
+
+### `disablewebsecurity`
+
+```html
+<webview src="https://www.github.com/" disablewebsecurity></webview>
+```
+
+"on"の際は、ゲストページのウェブセキュリティは無効となります。
+
+### `partition`
+
+```html
+<webview src="https://github.com" partition="persist:github"></webview>
+<webview src="http://electron.atom.io" partition="electron"></webview>
+```
+
+ページで使用されるセッションを設定します。もし、`partition`が`persist:`から始まる場合、アプリ上の同じ`partition`を指定した全てのページで有効な永続セッションを使用します。
+`persist:`接頭辞なしで指定した場合、メモリ内セッションを使用します。同じセッションを指定すると複数のページで同じセッションを使用できます。
+`partition`を設定しない場合は、アプリケーションのデフォルトセッションが使用されます。
+
+レンダラプロセスのセッションは変更できないため、この値は最初のページ遷移の前に変更されないといけません。
+その後に変更をしようとしても、DOM例外を起こすことになります。
+
+### `allowpopups`
+
+```html
+<webview src="https://www.github.com/" allowpopups></webview>
+```
+
+"on"の場合、ゲストページは新しいウィンドウを開くことができます。
+
+### `blinkfeatures`
+
+```html
+<webview src="https://www.github.com/" blinkfeatures="PreciseMemoryInfo, CSSVariables"></webview>
+```
+
+有効にしたいblink featureを`,`で区切って指定します。
+サポートされている全ての機能は、[setFeatureEnabledFromString][blink-feature-string]にリストがあります。
+
+## メソッド
+
+`webview`タグは、下記のようなメソッドを持っています：
+
+**注意:** webview要素はメソッドを使用する前に読み込まれていないといけません。
+
+**例**
+
+```javascript
+webview.addEventListener('dom-ready', () => {
+  webview.openDevTools();
+});
+```
+
+### `<webview>.loadURL(url[, options])`
+
+* `url` URL
+* `options` Object (optional)
+  * `httpReferrer` String - リファラURL 
+  * `userAgent` String - リクエストに使用されるUser agent
+  * `extraHeaders` String - 追加のヘッダを"\n"で区切って指定します。
+
+`url`をwebviewで読み込みます。`url`はプロトコル接頭辞(`http://`や`file://`など)を含んでいなければいけません。
+
+### `<webview>.getURL()`
+
+ゲストページのURLを取得します。
+
+### `<webview>.getTitle()`
+
+ゲストページのタイトルを返します。
+
+### `<webview>.isLoading()`
+
+ゲストページが読み込み中かのbool値を返します。
+
+### `<webview>.isWaitingForResponse()`
+
+ゲストページがページの最初の返答を待っているかのbool値を返します。
+
+### `<webview>.stop()`
+
+実行待ち中のナビゲーションを中止します。
+
+### `<webview>.reload()`
+
+ゲストページを再読み込みします。
+
+### `<webview>.reloadIgnoringCache()`
+
+キャッシュを無効にして再読み込みします。
+
+### `<webview>.canGoBack()`
+
+ページを戻ることができるかのbool値を返します。
+
+### `<webview>.canGoForward()`
+
+ページを進むことができるかのbool値を返します。
+
+### `<webview>.canGoToOffset(offset)`
+
+* `offset` Integer
+
+`offset`だけ、移動できるかのbool値を返します。
+
+### `<webview>.clearHistory()`
+
+移動履歴をクリアします。
+
+### `<webview>.goBack()`
+
+ページを戻ります。
+
+### `<webview>.goForward()`
+
+ページを進みます。
+
+### `<webview>.goToIndex(index)`
+
+* `index` Integer
+
+インデックスを指定して移動します。
+
+### `<webview>.goToOffset(offset)`
+
+* `offset` Integer
+
+現在の場所からの移動量を指定して移動します。
+
+### `<webview>.isCrashed()`
+
+レンダラプロセスがクラッシュしているかを返します。
+
+### `<webview>.setUserAgent(userAgent)`
+
+* `userAgent` String
+
+ゲストページ用のUser agentを変更します。
+
+### `<webview>.getUserAgent()`
+
+User agentを取得します。
+
+### `<webview>.insertCSS(css)`
+
+* `css` String
+
+ゲストエージにCSSを追加します。
+
+### `<webview>.executeJavaScript(code, userGesture, callback)`
+
+* `code` String
+* `userGesture` Boolean - Default `false`.
+* `callback` Function (optional) - Called after script has been executed.
+  * `result`
+
+ページ内で`code`を評価します。`userGesture`を設定した場合、ページ内でgesture contextを作成します。例えば`requestFullScreen`のようなユーザーの対応が必要なHTML APIでは、自動化時にこれが有利になる時があります。
+
+### `<webview>.openDevTools()`
+
+DevToolsを開きます。
+
+### `<webview>.closeDevTools()`
+
+DevToolsを閉じます。
+
+### `<webview>.isDevToolsOpened()`
+
+DevToolsが開いているかのbool値を返します。
+
+### `<webview>.isDevToolsFocused()`
+
+DevToolsがフォーカスを得ているかのbool値を返します。
+
+### `<webview>.inspectElement(x, y)`
+
+* `x` Integer
+* `y` Integer
+
+ゲストページの(`x`, `y`)の位置にある要素を調べます。
+
+### `<webview>.inspectServiceWorker()`
+
+ゲストページのサービスワーカーのDevToolsを開きます。
+
+### `<webview>.setAudioMuted(muted)`
+
+* `muted` Boolean
+
+ページをミュートするかを設定します。
+
+### `<webview>.isAudioMuted()`
+
+ページがミュートされているかを返します。
+
+### `<webview>.undo()`
+
+`undo` (元に戻す)を行います。
+Executes editing command `undo` in page.
+
+### `<webview>.redo()`
+
+`redo` (やり直し)を行います。
+
+### `<webview>.cut()`
+
+`cut` (切り取り)を行います。
+
+### `<webview>.copy()`
+
+`copy` (コピー)を行います。
+
+### `<webview>.paste()`
+
+`paste` (貼り付け)を行います。
+
+### `<webview>.pasteAndMatchStyle()`
+
+`pasteAndMatchStyle`(貼り付けてスタイルを合わせる)を行います。
+
+### `<webview>.delete()`
+
+`delete` (削除)を行います。
+
+### `<webview>.selectAll()`
+
+`selectAll` (全て選択)を行います。
+
+### `<webview>.unselect()`
+
+`unselect` (選択を解除)を行います。
+
+### `<webview>.replace(text)`
+
+* `text` String
+
+`replace` (置き換え)を行います。
+
+### `<webview>.replaceMisspelling(text)`
+
+* `text` String
+
+`replaceMisspelling` (スペル違いを置き換え)を行います。
+
+### `<webview>.insertText(text)`
+
+* `text` String
+
+`text`を選択された要素に挿入します。
+
+### `<webview>.findInPage(text[, options])`
+
+* `text` String - 検索する文字列(空文字列にはできません)
+* `options` Object (省略可)
+  * `forward` Boolean - 前方・後方のどちらを検索するかどうかです。省略時は`true`で前方に検索します。
+  * `findNext` Boolean - 初回検索か、次を検索するかを選びます。省略時は`false`で、初回検索です。
+  * `matchCase` Boolean - 大文字・小文字を区別するかを指定します。省略時は`false`で、区別しません。
+  * `wordStart` Boolean - ワード始まりからの検索かを指定します。省略時は`false`で、語途中でもマッチします。
+  * `medialCapitalAsWordStart` Boolean - `wordStart`指定時、CamelCaseの途中もワード始まりと見なすかを指定します。省略時は`false`です。
+
+`text`をページ内全てから検索し、リクエストに使用するリクエストID(`Integer`)を返します。リクエストの結果は、[`found-in-page`](web-view-tag.md#event-found-in-page)イベントを介して受け取ることができます。
+
+### `<webview>.stopFindInPage(action)`
+
+* `action` String - [`<webview>.findInPage`](web-view-tag.md#webviewtagfindinpage)リクエストを終わらせる時にとるアクションを指定します。
+  * `clearSelection` - 選択をクリアします。
+  * `keepSelection` - 選択を通常の選択へと変換します。
+  * `activateSelection` - 選択ノードにフォーカスを当て、クリックします。
+
+`action`にしたがって`webview`への`findInPage`リクエストを中止します。
+
+### `<webview>.print([options])`
+
+`webview`で表示されているウェブページを印刷します。`webContents.print([options])`と同じです。
+
+### `<webview>.printToPDF(options, callback)`
+
+`webview`のウェブサイトをPDFとして印刷します。`webContents.printToPDF(options, callback)`と同じです。
+
+### `<webview>.send(channel[, arg1][, arg2][, ...])`
+
+* `channel` String
+* `arg` (optional)
+
+`channel`を通じてレンダラプロセスに非同期メッセージを送ります。合わせて、
+任意のメッセージを送ることができます。レンダラプロセスは`ipcRenderer`モジュールを
+使用して、`channel`イベントでメッセージを把握することができます。
+
+サンプルが[webContents.send](web-contents.md#webcontentssendchannel-args)にあります。
+
+### `<webview>.sendInputEvent(event)`
+
+* `event` Object
+
+入力イベント(`event`)をページに送ります。
+
+`event`に関する詳しい説明は、[webContents.sendInputEvent](web-contents.md##webcontentssendinputeventevent)を
+参照してください。
+
+### `<webview>.getWebContents()`
+
+`webview`に関連付けられた[WebContents](web-contents.md)を取得します。
+
+## DOM events
+
+`webview`タグで有効なイベントは次の通りです：
+
+### Event: 'load-commit'
+
+返り値:
+
+* `url` String
+* `isMainFrame` Boolean
+
+読み込みが行われる時に発生するイベントです。
+これには、現在のドキュメントやサブフレームの読み込みが含まれます。ただし、非同期なリソース読み込みは含まれません。
+
+### Event: 'did-finish-load'
+
+ナビゲーションが完了した際に発生するイベントです。
+言い換えると、タブ上の"くるくる"が止まった時に発生し、`onload`イベントが配信されます。
+
+### Event: 'did-fail-load'
+
+返り値:
+
+* `errorCode` Integer
+* `errorDescription` String
+* `validatedURL` String
+* `isMainFrame` Boolean
+
+`did-finish-load`と同じようですが、読み込みに失敗した時やキャンセルされた時に発生します。
+例えば、`window.stop()`が呼ばれた時などです。
+
+### Event: 'did-frame-finish-load'
+
+返り値:
+
+* `isMainFrame` Boolean
+
+フレームがナビゲーションを終えた時に発生します。
+
+### Event: 'did-start-loading'
+
+タブ上の"くるくる"が回転を始めた時点でこのイベントが発生します。
+
+### Event: 'did-stop-loading'
+
+タブ上の"くるくる"が回転をやめた時点でこのイベントが発生します。
+
+### Event: 'did-get-response-details'
+
+返り値:
+
+* `status` Boolean
+* `newURL` String
+* `originalURL` String
+* `httpResponseCode` Integer
+* `requestMethod` String
+* `referrer` String
+* `headers` Object
+* `resourceType` String
+
+読み込むリソースの詳細がわかった時点で発生します。
+`status`は、リソースをダウンロードするソケット接続であるかを示します。
+
+### Event: 'did-get-redirect-request'
+
+返り値:
+
+* `oldURL` String
+* `newURL` String
+* `isMainFrame` Boolean
+
+リソースの取得中に、リダイレクトを受け取った際に発生します。
+
+### Event: 'dom-ready'
+
+該当フレーム内のドキュメントが読み込まれた時に発生します。
+
+### Event: 'page-title-updated'
+
+返り値:
+
+* `title` String
+* `explicitSet` Boolean
+
+ページのタイトルが設定された時に発生します。
+タイトルがurlから作られたものであれば、`explicitSet`は`false`になります。
+
+### Event: 'page-favicon-updated'
+
+返り値:
+
+* `favicons` Array - URLの配列
+
+ページのfavicon URLを受け取った時に発生します。
+
+### Event: 'enter-html-full-screen'
+
+HTML APIでフルスクリーンになった際に発生します。
+
+### Event: 'leave-html-full-screen'
+
+HTML APIでフルスクリーンでなくなった際に発生します。
+
+### Event: 'console-message'
+
+返り値:
+
+* `level` Integer
+* `message` String
+* `line` Integer
+* `sourceId` String
+
+ゲストウィンドウがコンソールメッセージを記録する際に発生します。
+
+下記のサンプルは、埋め込まれたサイトのログを、log levelに関係なく親側に転送します。
+
+
+```javascript
+webview.addEventListener('console-message', (e) => {
+  console.log('Guest page logged a message:', e.message);
+});
+```
+
+### Event: 'found-in-page'
+
+返り値:
+
+* `result` Object
+  * `requestId` Integer
+  * `finalUpdate` Boolean - 次のレスポンスが待っているかを示します。
+  * `activeMatchOrdinal` Integer (optional) - このマッチの場所を示します。
+  * `matches` Integer (optional) - マッチした数です。
+  * `selectionArea` Object (optional) - 最初のマッチした場所です。
+
+[`webview.findInPage`](web-view-tag.md#webviewtagfindinpage)リクエストで結果が得られた場合に発生します。
+
+```javascript
+webview.addEventListener('found-in-page', (e) => {
+  if (e.result.finalUpdate)
+    webview.stopFindInPage('keepSelection');
+});
+
+const requestId = webview.findInPage('test');
+```
+
+### Event: 'new-window'
+
+返り値:
+
+* `url` String
+* `frameName` String
+* `disposition` String -`default`, `foreground-tab`, `background-tab`,
+  `new-window`, `other`のどれかです。
+* `options` Object - 新しい`BrowserWindow`を作る際に使用されるoptionです。
+
+ゲストページが新しいブラウザウィンドウを開こうとする際に発生します。
+
+下記のサンプルは、新しいURLをシステムのデフォルトブラウザで開きます。
+
+```javascript
+const {shell} = require('electron');
+
+webview.addEventListener('new-window', (e) => {
+  const protocol = require('url').parse(e.url).protocol;
+  if (protocol === 'http:' || protocol === 'https:') {
+    shell.openExternal(e.url);
+  }
+});
+```
+
+### Event: 'will-navigate'
+
+返り値:
+
+* `url` String
+
+ユーザーまたはページがナビゲーションを始めようとする際に発生します。これは、
+`window.location`が変更になる時や、ユーザーがリンクをクリックした際に発生します。
+
+`<webview>.loadURL`や`<webview>.back`でプログラムによりナビゲーションが始まった場合は
+このイベントは発生しません。
+
+アンカーリンクのクリックや`window.location.hash`の変更といった、ページ内遷移でも、このイベントは発生しません。
+この場合は、`did-navigate-in-page`イベントを使ってください。
+
+`event.preventDefault()`は使用しても__何も起こりません__。
+
+### Event: 'did-navigate'
+
+返り値:
+
+* `url` String
+
+ナビゲーション終了時に呼ばれます。
+
+アンカーリンクのクリックや`window.location.hash`の変更といった、ページ内遷移では、このイベントは発生しません。
+この場合は、`did-navigate-in-page`イベントを使ってください。
+
+### Event: 'did-navigate-in-page'
+
+返り値:
+
+* `url` String
+
+ページ内遷移の際に発生します。
+
+ページ内遷移の際は、ページURLは変更になりますが、ページ外部へのナビゲーションは発生しません。
+例として、アンカーリンクのクリック時や、DOMの`hashchange`イベントが発生した時にこれが起こります。
+
+### Event: 'close'
+
+ゲストページそのものが、閉じられようとしている際に発生します。
+
+下記のサンプルは、`webview`が閉じられる際に、`about:blank`にナビゲートします。
+
+```javascript
+webview.addEventListener('close', () => {
+  webview.src = 'about:blank';
+});
+```
+
+### Event: 'ipc-message'
+
+返り値:
+
+* `channel` String
+* `args` Array
+
+ゲストページが埋め込み元に非同期メッセージを送ってきた際に発生します。
+
+`sendToHost`メソッドと、`ipc-message`イベントを利用すると、ゲストページと埋め込み元のページでデータのやり取りを簡単に行うことができます。
+
+```javascript
+// 埋め込み元ページ(<webview>があるページ)で
+webview.addEventListener('ipc-message', (event) => {
+  console.log(event.channel);
+  // Prints "pong"
+});
+webview.send('ping');
+```
+
+```javascript
+// ゲストページ(<webview>内)で
+const {ipcRenderer} = require('electron');
+ipcRenderer.on('ping', () => {
+  ipcRenderer.sendToHost('pong');
+});
+```
+
+### Event: 'crashed'
+
+プロセスがクラッシュした際に発生します。
+
+### Event: 'gpu-crashed'
+
+GPUプロセスがクラッシュした際に発生します。
+
+### Event: 'plugin-crashed'
+
+返り値:
+
+* `name` String
+* `version` String
+
+プラグインプロセスがクラッシュした際に発生します。
+
+### Event: 'destroyed'
+
+WebContentsが破壊された際に呼ばれます。
+
+### Event: 'media-started-playing'
+
+メディアの再生が開始された際に呼ばれます。
+
+### Event: 'media-paused'
+
+メディアが一時停止になるか、再生を終えた際に呼ばれます。
+
+### Event: 'did-change-theme-color'
+
+返り値:
+
+* `themeColor` String
+
+ページのテーマカラーが変更になった際に呼ばれます。
+これは、下記のようなメタタグがある際に通常発生します：
+
+```html
+<meta name='theme-color' content='#ff0000'>
+```
+
+### Event: 'devtools-opened'
+
+DevToolsが開かれた際に発生します。
+
+### Event: 'devtools-closed'
+
+DevToolsが閉じられた際に発生します。
+
+### Event: 'devtools-focused'
+
+DevToolsにフォーカスが当たった際 / 開かれた際に発生します。
+
+[blink-feature-string]: https://code.google.com/p/chromium/codesearch#chromium/src/out/Debug/gen/blink/platform/RuntimeEnabledFeatures.cpp&sq=package:chromium&type=cs&l=527

From 5ab86cc2dfc5bb550ff42b66824f95a90862041d Mon Sep 17 00:00:00 2001
From: TAKAHASHI Kyohei <kcrt@kcrt.net>
Date: Mon, 30 May 2016 14:02:15 +0900
Subject: [PATCH 485/510] :memo: trivial change in web-view-tag.md

There is a mistake about the information of `stopFindInPage`.
[ci skip]
---
 docs/api/web-view-tag.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/api/web-view-tag.md b/docs/api/web-view-tag.md
index b1d3aaead1e5..f99bb4fdb5a1 100644
--- a/docs/api/web-view-tag.md
+++ b/docs/api/web-view-tag.md
@@ -171,7 +171,7 @@ page is loaded, use the `setUserAgent` method to change the user agent.
 
 If "on", the guest page will have web security disabled.
 
-### partition
+### `partition`
 
 ```html
 <webview src="https://github.com" partition="persist:github"></webview>
@@ -445,8 +445,8 @@ obtained by subscribing to [`found-in-page`](web-view-tag.md#event-found-in-page
 
 * `action` String - Specifies the action to take place when ending
   [`<webview>.findInPage`](web-view-tag.md#webviewtagfindinpage) request.
-  * `clearSelection` - Translate the selection into a normal selection.
-  * `keepSelection` - Clear the selection.
+  * `clearSelection` - Clear the selection.
+  * `keepSelection` - Translate the selection into a normal selection.
   * `activateSelection` - Focus and click the selection node.
 
 Stops any `findInPage` request for the `webview` with the provided `action`.
@@ -457,7 +457,7 @@ Prints `webview`'s web page. Same with `webContents.print([options])`.
 
 ### `<webview>.printToPDF(options, callback)`
 
-Prints webview's web page as PDF, Same with `webContents.printToPDF(options, callback)`
+Prints `webview`'s web page as PDF, Same with `webContents.printToPDF(options, callback)`
 
 ### `<webview>.send(channel[, arg1][, arg2][, ...])`
 
@@ -628,7 +628,7 @@ webview.addEventListener('found-in-page', (e) => {
     webview.stopFindInPage('keepSelection');
 });
 
-const rquestId = webview.findInPage('test');
+const requestId = webview.findInPage('test');
 ```
 
 ### Event: 'new-window'

From ce0d3d93abe060b5c46a55b85bc93eca1b6a9984 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 15:20:53 +0900
Subject: [PATCH 486/510] spec: disablewebsecurity should not break preload and
 node integration

---
 spec/api-ipc-spec.js |  2 +-
 spec/webview-spec.js | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js
index 66fa308dd621..e88815873af9 100644
--- a/spec/api-ipc-spec.js
+++ b/spec/api-ipc-spec.js
@@ -29,7 +29,7 @@ describe('ipc module', function () {
       assert.equal(a.id, 1127)
     })
 
-    it.only('should work when object has no prototype', function () {
+    it('should work when object has no prototype', function () {
       var a = remote.require(path.join(fixtures, 'module', 'no-prototype.js'))
       assert.equal(a.foo.bar, 'baz')
       assert.equal(a.foo.baz, false)
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 7bdb3a632e0c..b1fa4405ada8 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -259,6 +259,30 @@ describe('<webview> tag', function () {
       webview.src = 'data:text/html;base64,' + encoded
       document.body.appendChild(webview)
     })
+
+    it('does not break node integration', function (done) {
+      webview.addEventListener('console-message', function (e) {
+        assert.equal(e.message, 'function object object')
+        done()
+      })
+      webview.setAttribute('nodeintegration', 'on')
+      webview.setAttribute('disablewebsecurity', '')
+      webview.src = 'file://' + fixtures + '/pages/d.html'
+      document.body.appendChild(webview)
+    })
+
+    it('does not break preload script', function (done) {
+      var listener = function (e) {
+        assert.equal(e.message, 'function object object')
+        webview.removeEventListener('console-message', listener)
+        done()
+      }
+      webview.addEventListener('console-message', listener)
+      webview.setAttribute('disablewebsecurity', '')
+      webview.setAttribute('preload', fixtures + '/module/preload.js')
+      webview.src = 'file://' + fixtures + '/pages/e.html'
+      document.body.appendChild(webview)
+    })
   })
 
   describe('partition attribute', function () {

From 6755aa44f67b6dcad4937d09e14d87b38a8686e7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 14:56:31 +0900
Subject: [PATCH 487/510] Initialize script context in DidClearWindowObject

Doing it in RunScriptsAtDocumentStart would somehow result in weird
results when webSecurity is off.
---
 atom/renderer/atom_renderer_client.cc | 12 +++++++++---
 atom/renderer/atom_renderer_client.h  |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 283930b829a2..ee2dd7d54e04 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -68,6 +68,10 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
         renderer_client_(renderer_client) {}
 
   // content::RenderFrameObserver:
+  void DidClearWindowObject() override {
+    renderer_client_->DidClearWindowObject(render_frame_);
+  }
+
   void DidCreateScriptContext(v8::Handle<v8::Context> context,
                               int extension_group,
                               int world_id) override {
@@ -185,12 +189,14 @@ void AtomRendererClient::RenderViewCreated(content::RenderView* render_view) {
   }
 }
 
-void AtomRendererClient::RunScriptsAtDocumentStart(
+void AtomRendererClient::DidClearWindowObject(
     content::RenderFrame* render_frame) {
   // Make sure every page will get a script context created.
-  render_frame->GetWebFrame()->executeScript(
-      blink::WebScriptSource("void 0"));
+  render_frame->GetWebFrame()->executeScript(blink::WebScriptSource("void 0"));
+}
 
+void AtomRendererClient::RunScriptsAtDocumentStart(
+    content::RenderFrame* render_frame) {
   // Inform the document start pharse.
   node::Environment* env = node_bindings_->uv_env();
   if (env) {
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 51872e5bcba9..f4a548908e06 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -21,6 +21,7 @@ class AtomRendererClient : public content::ContentRendererClient {
   AtomRendererClient();
   virtual ~AtomRendererClient();
 
+  void DidClearWindowObject(content::RenderFrame* render_frame);
   void DidCreateScriptContext(
       v8::Handle<v8::Context> context, content::RenderFrame* render_frame);
   void WillReleaseScriptContext(

From 49f127860183bbc4fa9a95ceb7b2e3d08c3ec996 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 20:31:00 +0900
Subject: [PATCH 488/510] Refactor the URLRequestFetchJob code

This makes the read end and write end of the pipe have same logic, so it
is more easy to maintain.
---
 atom/browser/net/url_request_fetch_job.cc | 93 +++++++++++------------
 atom/browser/net/url_request_fetch_job.h  | 25 +++---
 spec/api-protocol-spec.js                 |  2 +-
 3 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/atom/browser/net/url_request_fetch_job.cc b/atom/browser/net/url_request_fetch_job.cc
index 388b9f9550b3..0f293c22fcf6 100644
--- a/atom/browser/net/url_request_fetch_job.cc
+++ b/atom/browser/net/url_request_fetch_job.cc
@@ -77,7 +77,8 @@ class ResponsePiper : public net::URLFetcherResponseWriter {
 URLRequestFetchJob::URLRequestFetchJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate)
     : JsAsker<net::URLRequestJob>(request, network_delegate),
-      pending_buffer_size_(0) {
+      pending_buffer_size_(0),
+      write_num_bytes_(0) {
 }
 
 void URLRequestFetchJob::BeforeStartInUI(
@@ -169,22 +170,21 @@ void URLRequestFetchJob::HeadersCompleted() {
 int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
                                       int num_bytes,
                                       const net::CompletionCallback& callback) {
-  // Store the data in a drainable IO buffer if pending_buffer_ is empty, i.e.
-  // there's no ReadRawData() operation waiting for IO completion.
+  // When pending_buffer_ is empty, there's no ReadRawData() operation waiting
+  // for IO completion, we have to save the parameters until the request is
+  // ready to read data.
   if (!pending_buffer_.get()) {
-    response_piper_callback_ = callback;
-    drainable_buffer_ = new net::DrainableIOBuffer(buffer, num_bytes);
+    write_buffer_ = buffer;
+    write_num_bytes_ = num_bytes;
+    write_callback_ = callback;
     return net::ERR_IO_PENDING;
   }
 
-  // pending_buffer_ is set to the IOBuffer instance provided to ReadRawData()
-  // by URLRequestJob.
-  int bytes_read = std::min(num_bytes, pending_buffer_size_);
-  memcpy(pending_buffer_->data(), buffer->data(), bytes_read);
-
-  ClearPendingBuffer();
-
+  // Write data to the pending buffer and clear them after the writing.
+  int bytes_read = BufferCopy(buffer, num_bytes,
+                              pending_buffer_.get(), pending_buffer_size_);
   ReadRawDataComplete(bytes_read);
+  ClearPendingBuffer();
   return bytes_read;
 }
 
@@ -193,46 +193,26 @@ void URLRequestFetchJob::Kill() {
   fetcher_.reset();
 }
 
-void URLRequestFetchJob::StartReading() {
-  if (drainable_buffer_.get()) {
-    auto num_bytes = drainable_buffer_->BytesRemaining();
-    if (num_bytes <= 0 && !response_piper_callback_.is_null()) {
-      int size = drainable_buffer_->BytesConsumed();
-      drainable_buffer_ = nullptr;
-      response_piper_callback_.Run(size);
-      response_piper_callback_.Reset();
-      return;
-    }
-
-    int bytes_read = std::min(num_bytes, pending_buffer_size_);
-    memcpy(pending_buffer_->data(), drainable_buffer_->data(), bytes_read);
-
-    drainable_buffer_->DidConsume(bytes_read);
-
-    ClearPendingBuffer();
-
-    ReadRawDataComplete(bytes_read);
-  }
-}
-
-void URLRequestFetchJob::ClearPendingBuffer() {
-  // Clear the buffers before notifying the read is complete, so that it is
-  // safe for the observer to read.
-  pending_buffer_ = nullptr;
-  pending_buffer_size_ = 0;
-}
-
 int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
   if (GetResponseCode() == 204) {
     request()->set_received_response_content_length(prefilter_bytes_read());
     return net::OK;
   }
-  pending_buffer_ = dest;
-  pending_buffer_size_ = dest_size;
-  // Read from drainable_buffer_ if available, i.e. response data became
-  // available before ReadRawData was called.
-  StartReading();
-  return net::ERR_IO_PENDING;
+
+  // When write_buffer_ is empty, there is no data valable yet, we have to save
+  // the dest buffer util DataAvailable.
+  if (!write_buffer_.get()) {
+    pending_buffer_ = dest;
+    pending_buffer_size_ = dest_size;
+    return net::ERR_IO_PENDING;
+  }
+
+  // Read from the write buffer and clear them after reading.
+  int bytes_read = BufferCopy(write_buffer_.get(), write_num_bytes_,
+                              dest, dest_size);
+  write_callback_.Run(bytes_read);
+  ClearWriteBuffer();
+  return bytes_read;
 }
 
 bool URLRequestFetchJob::GetMimeType(std::string* mime_type) const {
@@ -264,6 +244,7 @@ void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
   }
 
   ClearPendingBuffer();
+  ClearWriteBuffer();
 
   if (fetcher_->GetStatus().is_success())
     ReadRawDataComplete(0);
@@ -271,4 +252,22 @@ void URLRequestFetchJob::OnURLFetchComplete(const net::URLFetcher* source) {
     NotifyStartError(fetcher_->GetStatus());
 }
 
+int URLRequestFetchJob::BufferCopy(net::IOBuffer* source, int num_bytes,
+                                   net::IOBuffer* target, int target_size) {
+  int bytes_written = std::min(num_bytes, target_size);
+  memcpy(target->data(), source->data(), bytes_written);
+  return bytes_written;
+}
+
+void URLRequestFetchJob::ClearPendingBuffer() {
+  pending_buffer_ = nullptr;
+  pending_buffer_size_ = 0;
+}
+
+void URLRequestFetchJob::ClearWriteBuffer() {
+  write_buffer_ = nullptr;
+  write_num_bytes_ = 0;
+  write_callback_.Reset();
+}
+
 }  // namespace atom
diff --git a/atom/browser/net/url_request_fetch_job.h b/atom/browser/net/url_request_fetch_job.h
index da1c1678e58a..906ba68d3965 100644
--- a/atom/browser/net/url_request_fetch_job.h
+++ b/atom/browser/net/url_request_fetch_job.h
@@ -9,14 +9,10 @@
 
 #include "atom/browser/net/js_asker.h"
 #include "browser/url_request_context_getter.h"
-#include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_fetcher_delegate.h"
-#include "net/url_request/url_request_job.h"
 
 namespace atom {
 
-class AtomBrowserContext;
-
 class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
                            public net::URLFetcherDelegate,
                            public brightray::URLRequestContextGetter::Delegate {
@@ -30,9 +26,6 @@ class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
                     const net::CompletionCallback& callback);
 
  protected:
-  void StartReading();
-  void ClearPendingBuffer();
-
   // JsAsker:
   void BeforeStartInUI(v8::Isolate*, v8::Local<v8::Value>) override;
   void StartAsync(std::unique_ptr<base::Value> options) override;
@@ -48,13 +41,23 @@ class URLRequestFetchJob : public JsAsker<net::URLRequestJob>,
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
+  int BufferCopy(net::IOBuffer* source, int num_bytes,
+                 net::IOBuffer* target, int target_size);
+  void ClearPendingBuffer();
+  void ClearWriteBuffer();
+
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   std::unique_ptr<net::URLFetcher> fetcher_;
-  scoped_refptr<net::IOBuffer> pending_buffer_;
-  scoped_refptr<net::DrainableIOBuffer> drainable_buffer_;
-  int pending_buffer_size_;
   std::unique_ptr<net::HttpResponseInfo> response_info_;
-  net::CompletionCallback response_piper_callback_;
+
+  // Saved arguments passed to ReadRawData.
+  scoped_refptr<net::IOBuffer> pending_buffer_;
+  int pending_buffer_size_;
+
+  // Saved arguments passed to DataAvailable.
+  scoped_refptr<net::IOBuffer> write_buffer_;
+  int write_num_bytes_;
+  net::CompletionCallback write_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestFetchJob);
 };
diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
index 1b46d586a41a..803511917104 100644
--- a/spec/api-protocol-spec.js
+++ b/spec/api-protocol-spec.js
@@ -511,7 +511,7 @@ describe('protocol module', function () {
       })
     })
 
-    it('loads resource for webContents', function (done) {
+    it('works when target URL redirects', function (done) {
       var contents = null
       var server = http.createServer(function (req, res) {
         if (req.url == '/serverRedirect') {

From f02143b8f2dbd125e40c13aa537c6a6a639299e7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 30 May 2016 22:31:38 +0900
Subject: [PATCH 489/510] Clear the buffers before notifying the other end of
 the pipe

---
 atom/browser/net/url_request_fetch_job.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/atom/browser/net/url_request_fetch_job.cc b/atom/browser/net/url_request_fetch_job.cc
index 0f293c22fcf6..8279d09d5dad 100644
--- a/atom/browser/net/url_request_fetch_job.cc
+++ b/atom/browser/net/url_request_fetch_job.cc
@@ -183,8 +183,8 @@ int URLRequestFetchJob::DataAvailable(net::IOBuffer* buffer,
   // Write data to the pending buffer and clear them after the writing.
   int bytes_read = BufferCopy(buffer, num_bytes,
                               pending_buffer_.get(), pending_buffer_size_);
-  ReadRawDataComplete(bytes_read);
   ClearPendingBuffer();
+  ReadRawDataComplete(bytes_read);
   return bytes_read;
 }
 
@@ -210,8 +210,9 @@ int URLRequestFetchJob::ReadRawData(net::IOBuffer* dest, int dest_size) {
   // Read from the write buffer and clear them after reading.
   int bytes_read = BufferCopy(write_buffer_.get(), write_num_bytes_,
                               dest, dest_size);
-  write_callback_.Run(bytes_read);
+  net::CompletionCallback write_callback = write_callback_;
   ClearWriteBuffer();
+  write_callback.Run(bytes_read);
   return bytes_read;
 }
 

From 381da769671baf10008532c6dfb0cbda8fbddee5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 May 2016 10:19:13 +0900
Subject: [PATCH 490/510] Correctly redirect output to console

---
 atom/app/atom_main.cc | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
index 03055e04daf5..1e69ba4ba839 100644
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -15,6 +15,7 @@
 #include "atom/app/atom_main_delegate.h"
 #include "atom/common/crash_reporter/win/crash_service_main.h"
 #include "base/environment.h"
+#include "base/process/launch.h"
 #include "base/win/windows_version.h"
 #include "content/public/app/sandbox_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
@@ -46,10 +47,6 @@ bool IsEnvSet(const char* name) {
 #endif
 }
 
-bool IsRunAsNode() {
-  return IsEnvSet(kRunAsNode);
-}
-
 }  // namespace
 
 #if defined(OS_WIN)
@@ -57,14 +54,11 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   int argc = 0;
   wchar_t** wargv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
 
-  // Make output work in console if we are not in cygiwn.
-  if (!IsEnvSet("TERM") && !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE")) {
-    AttachConsole(ATTACH_PARENT_PROCESS);
+  bool run_as_node = IsEnvSet(kRunAsNode);
 
-    FILE* dontcare;
-    freopen_s(&dontcare, "CON", "w", stdout);
-    freopen_s(&dontcare, "CON", "w", stderr);
-  }
+  // Make sure the output is printed to console.
+  if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
+    base::RouteStdioToConsole(false);
 
   // Convert argv to to UTF8
   char** argv = new char*[argc];
@@ -100,7 +94,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
     }
   }
 
-  if (IsRunAsNode()) {
+  if (run_as_node) {
     // Now that argv conversion is done, we can finally start.
     base::AtExitManager atexit_manager;
     base::i18n::InitializeICU();
@@ -123,7 +117,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
 #elif defined(OS_LINUX)  // defined(OS_WIN)
 
 int main(int argc, const char* argv[]) {
-  if (IsRunAsNode()) {
+  if (IsEnvSet(kRunAsNode)) {
     base::i18n::InitializeICU();
     base::AtExitManager atexit_manager;
     return atom::NodeMain(argc, const_cast<char**>(argv));
@@ -140,7 +134,7 @@ int main(int argc, const char* argv[]) {
 #else  // defined(OS_LINUX)
 
 int main(int argc, const char* argv[]) {
-  if (IsRunAsNode()) {
+  if (IsEnvSet(kRunAsNode)) {
     return AtomInitializeICUandStartNode(argc, const_cast<char**>(argv));
   }
 

From 4d8994df921087653c2e134e39a1da16a957bf39 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 May 2016 10:26:19 +0900
Subject: [PATCH 491/510] spec: child_process.fork shouble be able to pipe
 stdio

---
 spec/fixtures/module/process-stdout.js |  1 +
 spec/node-spec.js                      | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 spec/fixtures/module/process-stdout.js

diff --git a/spec/fixtures/module/process-stdout.js b/spec/fixtures/module/process-stdout.js
new file mode 100644
index 000000000000..953750a247f9
--- /dev/null
+++ b/spec/fixtures/module/process-stdout.js
@@ -0,0 +1 @@
+process.stdout.write('pipes stdio')
diff --git a/spec/node-spec.js b/spec/node-spec.js
index 71fdbac98664..93a247ef4ff6 100644
--- a/spec/node-spec.js
+++ b/spec/node-spec.js
@@ -76,6 +76,19 @@ describe('node feature', function () {
         })
         child.send('message')
       })
+
+      it('pipes stdio', function (done) {
+        let child = child_process.fork(path.join(fixtures, 'module', 'process-stdout.js'), {silent: true})
+        let data = ''
+        child.stdout.on('data', (chunk) => {
+          data += String(chunk)
+        })
+        child.on('exit', (code) => {
+          assert.equal(code, 0)
+          assert.equal(data, 'pipes stdio')
+          done()
+        })
+      })
     })
   })
 

From aea2135016a45c90b28d5e1c89fdd46787d328de Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 31 May 2016 17:47:45 +0900
Subject: [PATCH 492/510] Keep copies of window icons

---
 atom/browser/native_window_views.cc | 10 +++++++---
 atom/browser/native_window_views.h  |  5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 21bff6388a66..e699892d4ac5 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -786,12 +786,16 @@ gfx::AcceleratedWidget NativeWindowViews::GetAcceleratedWidget() {
 }
 
 #if defined(OS_WIN)
-void NativeWindowViews::SetIcon(HICON small_icon, HICON app_icon) {
+void NativeWindowViews::SetIcon(HICON window_icon, HICON app_icon) {
+  // We are responsible for storing the images.
+  window_icon_ = base::win::ScopedHICON(CopyIcon(window_icon));
+  app_icon_ = base::win::ScopedHICON(CopyIcon(app_icon));
+
   HWND hwnd = GetAcceleratedWidget();
   SendMessage(hwnd, WM_SETICON, ICON_SMALL,
-              reinterpret_cast<LPARAM>(small_icon));
+              reinterpret_cast<LPARAM>(window_icon_.get()));
   SendMessage(hwnd, WM_SETICON, ICON_BIG,
-              reinterpret_cast<LPARAM>(app_icon));
+              reinterpret_cast<LPARAM>(app_icon_.get()));
 }
 #elif defined(USE_X11)
 void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 85c7ddbeba7a..909c5b6fd4ba 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -17,6 +17,7 @@
 #if defined(OS_WIN)
 #include "atom/browser/ui/win/message_handler_delegate.h"
 #include "atom/browser/ui/win/taskbar_host.h"
+#include "base/win/scoped_gdi_object.h"
 #endif
 
 namespace views {
@@ -205,6 +206,10 @@ class NativeWindowViews : public NativeWindow,
 
   // If true we have enabled a11y
   bool enabled_a11y_support_;
+
+  // The icons of window and taskbar.
+  base::win::ScopedHICON window_icon_;
+  base::win::ScopedHICON app_icon_;
 #endif
 
   // Handles unhandled keyboard messages coming back from the renderer process.

From fc6628d159395731832cf58c5adb61108923bcea Mon Sep 17 00:00:00 2001
From: Vasu Mahesh <vasu.mahesh@hotmail.com>
Date: Tue, 31 May 2016 22:29:07 +0530
Subject: [PATCH 493/510] Add: custom pageSize for printToPDF

---
 docs/api/web-contents.md        |  2 +-
 lib/browser/api/web-contents.js | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index d0716305ab9f..89d7e1245d77 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -655,7 +655,7 @@ size.
   * `marginsType` Integer - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
   * `pageSize` String - Specify page size of the generated PDF. Can be `A3`,
-    `A4`, `A5`, `Legal`, `Letter` and `Tabloid`.
+    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` & `width` in Microns.
   * `printBackground` Boolean - Whether to print CSS backgrounds.
   * `printSelectionOnly` Boolean - Whether to print selection only.
   * `landscape` Boolean - `true` for landscape, `false` for portrait.
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 0f79a185ffc9..00057e16e8b8 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -197,11 +197,31 @@ let wrapWebContents = function (webContents) {
     if (options.printBackground) {
       printingSetting.shouldPrintBackgrounds = options.printBackground
     }
-    if (options.pageSize && PDFPageSize[options.pageSize]) {
-      printingSetting.mediaSize = PDFPageSize[options.pageSize]
-    } else {
-      printingSetting.mediaSize = PDFPageSize['A4']
+
+    if (options.pageSize) {
+      let height = 0
+      let width = 0
+      if (typeof options.pageSize === 'object') {
+        // Dimensions in Microns
+        // 1 meter = 10^6 microns
+        height = options.pageSize.height ? options.pageSize.height : 0
+        width = options.pageSize.width ? options.pageSize.width : 0
+      }
+
+      if (height > 0 && width > 0) {
+        printingSetting.mediaSize = {
+          height_microns: height,
+          name: 'CUSTOM',
+          width_microns: width,
+          custom_display_name: 'Custom'
+        }
+      } else if (PDFPageSize[options.pageSize]) {
+        printingSetting.mediaSize = PDFPageSize[options.pageSize]
+      } else {
+        printingSetting.mediaSize = PDFPageSize['A4']
+      }
     }
+
     return this._printToPDF(printingSetting, callback)
   }
 }

From 606fc1a5b7b66cd23b489b8ecd7097ed3d0b46a4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 31 May 2016 16:48:03 -0700
Subject: [PATCH 494/510] Add plist path variables

---
 .../mac-app-store-submission-guide.md         | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/docs/tutorial/mac-app-store-submission-guide.md b/docs/tutorial/mac-app-store-submission-guide.md
index c6ae061bd762..d240cc13371b 100644
--- a/docs/tutorial/mac-app-store-submission-guide.md
+++ b/docs/tutorial/mac-app-store-submission-guide.md
@@ -94,21 +94,24 @@ RESULT_PATH="~/Desktop/$APP.pkg"
 # The name of certificates you requested.
 APP_KEY="3rd Party Mac Developer Application: Company Name (APPIDENTITY)"
 INSTALLER_KEY="3rd Party Mac Developer Installer: Company Name (APPIDENTITY)"
+# The path of your plist files.
+CHILD_PLIST="/path/to/child.plist"
+PARENT_PLIST="/path/to/parent.plist"
 
 FRAMEWORKS_PATH="$APP_PATH/Contents/Frameworks"
 
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Electron Framework"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libnode.dylib"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/Electron Framework.framework"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/Contents/MacOS/$APP Helper"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper.app/"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/Contents/MacOS/$APP Helper EH"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper EH.app/"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/Contents/MacOS/$APP Helper NP"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$FRAMEWORKS_PATH/$APP Helper NP.app/"
-codesign -s "$APP_KEY" -f --entitlements child.plist "$APP_PATH/Contents/MacOS/$APP"
-codesign -s "$APP_KEY" -f --entitlements parent.plist "$APP_PATH"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Electron Framework"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/Electron Framework.framework/Versions/A/Libraries/libnode.dylib"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/Electron Framework.framework"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/$APP Helper.app/Contents/MacOS/$APP Helper"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/$APP Helper.app/"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/$APP Helper EH.app/Contents/MacOS/$APP Helper EH"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/$APP Helper EH.app/"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/$APP Helper NP.app/Contents/MacOS/$APP Helper NP"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$FRAMEWORKS_PATH/$APP Helper NP.app/"
+codesign -s "$APP_KEY" -f --entitlements "$CHILD_PLIST" "$APP_PATH/Contents/MacOS/$APP"
+codesign -s "$APP_KEY" -f --entitlements "$PARENT_PLIST" "$APP_PATH"
 
 productbuild --component "$APP_PATH" /Applications --sign "$INSTALLER_KEY" "$RESULT_PATH"
 ```

From 2aa1aedd92c58106ecbeddb31c4aeaabdfe9044c Mon Sep 17 00:00:00 2001
From: Garen Torikian <gjtorikian@users.noreply.github.com>
Date: Tue, 31 May 2016 17:51:09 -0700
Subject: [PATCH 495/510] Fix typo

---
 docs/tutorial/electron-versioning.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/electron-versioning.md b/docs/tutorial/electron-versioning.md
index 10e9679b0bd9..bf442041c2cc 100644
--- a/docs/tutorial/electron-versioning.md
+++ b/docs/tutorial/electron-versioning.md
@@ -4,7 +4,7 @@ If you are a seasoned Node developer, you are surely aware of `semver` - and
 might be used to giving your dependency management systems only rough guidelines
 rather than fixed version numbers. Due to the hard dependency on Node and
 Chromium, Electron is in a slightly more difficult position and does not follow
-semver. You should therefor always reference a specific version of Electron.
+semver. You should therefore always reference a specific version of Electron.
 
 Version numbers are bumped using the following rules:
 

From d10552413578e24c4d4087268a3712767235761f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 10:42:24 +0900
Subject: [PATCH 496/510] Cleanup the JavaScript code of session

---
 lib/browser/api/session.js      | 19 ++++++++++++-------
 lib/browser/api/web-contents.js |  7 -------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/browser/api/session.js b/lib/browser/api/session.js
index 9c42f3645603..49b169bd3ac5 100644
--- a/lib/browser/api/session.js
+++ b/lib/browser/api/session.js
@@ -1,14 +1,12 @@
+const {EventEmitter} = require('events')
 const bindings = process.atomBinding('session')
+
 const PERSIST_PREFIX = 'persist:'
 
 // Returns the Session from |partition| string.
-exports.fromPartition = function (partition) {
-  if (partition == null) {
-    partition = ''
-  }
-  if (partition === '') {
-    return exports.defaultSession
-  }
+exports.fromPartition = function (partition = '') {
+  if (partition === '') return exports.defaultSession
+
   if (partition.startsWith(PERSIST_PREFIX)) {
     return bindings.fromPartition(partition.substr(PERSIST_PREFIX.length), false)
   } else {
@@ -23,3 +21,10 @@ Object.defineProperty(exports, 'defaultSession', {
     return bindings.fromPartition('', false)
   }
 })
+
+const wrapSession = function (session) {
+  // Session is an EventEmitter.
+  Object.setPrototypeOf(session, EventEmitter.prototype)
+}
+
+bindings._setWrapSession(wrapSession)
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 0f79a185ffc9..fbb91879f80c 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -5,7 +5,6 @@ const {ipcMain, Menu, NavigationController} = require('electron')
 
 const binding = process.atomBinding('web_contents')
 const debuggerBinding = process.atomBinding('debugger')
-const sessionBinding = process.atomBinding('session')
 
 let nextId = 0
 
@@ -212,14 +211,8 @@ let wrapDebugger = function (webContentsDebugger) {
   Object.setPrototypeOf(webContentsDebugger, EventEmitter.prototype)
 }
 
-var wrapSession = function (session) {
-  // session is an EventEmitter.
-  Object.setPrototypeOf(session, EventEmitter.prototype)
-}
-
 binding._setWrapWebContents(wrapWebContents)
 debuggerBinding._setWrapDebugger(wrapDebugger)
-sessionBinding._setWrapSession(wrapSession)
 
 module.exports = {
   create (options = {}) {

From 8dfbbcefc8213f6f7eca9dc2b023e1d47c6b50de Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 10:53:06 +0900
Subject: [PATCH 497/510] Throw error when session module is used before app is
 ready

---
 lib/browser/api/session.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/browser/api/session.js b/lib/browser/api/session.js
index 49b169bd3ac5..dc1c529878fb 100644
--- a/lib/browser/api/session.js
+++ b/lib/browser/api/session.js
@@ -1,16 +1,26 @@
 const {EventEmitter} = require('events')
+const electron = require('electron')
 const bindings = process.atomBinding('session')
 
 const PERSIST_PREFIX = 'persist:'
 
+// Wrapper of binding.fromPartition that checks for ready event.
+const fromPartition = function (partition, persist) {
+  if (!electron.app.isReady()) {
+    throw new Error('session module can only be used when app is ready')
+  }
+
+  return bindings.fromPartition(partition, persist)
+}
+
 // Returns the Session from |partition| string.
 exports.fromPartition = function (partition = '') {
   if (partition === '') return exports.defaultSession
 
   if (partition.startsWith(PERSIST_PREFIX)) {
-    return bindings.fromPartition(partition.substr(PERSIST_PREFIX.length), false)
+    return fromPartition(partition.substr(PERSIST_PREFIX.length), false)
   } else {
-    return bindings.fromPartition(partition, true)
+    return fromPartition(partition, true)
   }
 }
 
@@ -18,7 +28,7 @@ exports.fromPartition = function (partition = '') {
 Object.defineProperty(exports, 'defaultSession', {
   enumerable: true,
   get: function () {
-    return bindings.fromPartition('', false)
+    return fromPartition('', false)
   }
 })
 

From 89adc122c3bfcb0bbd9404bfc5e85de7c952a9d1 Mon Sep 17 00:00:00 2001
From: Colin Eberhardt <colin.eberhardt@gmail.com>
Date: Wed, 1 Jun 2016 06:36:45 +0100
Subject: [PATCH 498/510] Minor typo fixes

---
 docs/tutorial/security.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index 947948720371..2ac25d135ebc 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -9,7 +9,7 @@ discovered security threats.
 When working with Electron, it is important to understand that Electron is not
 a web browser. It allows you to build feature-rich desktop applications with
 familiar web technologies, but your code wields much greater power. JavaScript
-can access to the filesystem, the user shell, and more. This allows you to build
+can access the filesystem, user shell, and more. This allows you to build
 high quality native applications, but the inherent security risks scale with the
 additional powers granted to your code.
 

From 523e8c2e1c815d58a7facf65a34f072f593ccfd5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 14:01:59 +0900
Subject: [PATCH 499/510] Update libchromiumcontent and brightray for #5781

---
 script/lib/config.py | 2 +-
 vendor/brightray     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index 006faf1b920a..43423e514368 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = 'eda589282bd7729f36960d2e669d4b81375b897c'
+LIBCHROMIUMCONTENT_COMMIT = '8f2a0aa0a9dd107e4d574cc9d552781c55c86bab'
 
 PLATFORM = {
   'cygwin': 'win32',
diff --git a/vendor/brightray b/vendor/brightray
index e9b2a4ffa292..9ccab3c9a87c 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit e9b2a4ffa29209fbd12a0b1613e8633d42f0b103
+Subproject commit 9ccab3c9a87cc57b4a37c4a03e17b589ac81d6ae

From 5bb8da60737802d9c4e09b2c813ec93539fb92be Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 14:57:35 +0900
Subject: [PATCH 500/510] Explicitly initialize session before webContents

---
 lib/browser/api/app.js          | 5 +++--
 lib/browser/api/web-contents.js | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index f8a531626bf7..09835a792e0e 100644
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,6 +1,7 @@
 'use strict'
 
-const {deprecate, Menu, session} = require('electron')
+const electron = require('electron')
+const {deprecate, Menu} = electron
 const {EventEmitter} = require('events')
 
 const bindings = process.atomBinding('app')
@@ -49,7 +50,7 @@ app.allowNTLMCredentialsForAllDomains = function (allow) {
   if (!this.isReady()) {
     this.commandLine.appendSwitch('auth-server-whitelist', domains)
   } else {
-    session.defaultSession.allowNTLMCredentialsForDomains(domains)
+    electron.session.defaultSession.allowNTLMCredentialsForDomains(domains)
   }
 }
 
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index cb8cf41e3aa6..059f204e1ee7 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -1,7 +1,11 @@
 'use strict'
 
 const {EventEmitter} = require('events')
-const {ipcMain, Menu, NavigationController} = require('electron')
+const {ipcMain, session, Menu, NavigationController} = require('electron')
+
+// session is not used here, the purpose is to make sure session is initalized
+// before the webContents module.
+session
 
 const binding = process.atomBinding('web_contents')
 const debuggerBinding = process.atomBinding('debugger')

From eb882855bcd5dc925695ceb54669da51696f9bcd Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 15:08:51 +0900
Subject: [PATCH 501/510] Cleanup the CoffeeScript converted code

---
 lib/browser/api/web-contents.js | 46 ++++++++++++++-------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 059f204e1ee7..d7bcdb455b33 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -11,12 +11,11 @@ const binding = process.atomBinding('web_contents')
 const debuggerBinding = process.atomBinding('debugger')
 
 let nextId = 0
-
-let getNextId = function () {
+const getNextId = function () {
   return ++nextId
 }
 
-let PDFPageSize = {
+const PDFPageSize = {
   A5: {
     custom_display_name: 'A5',
     height_microns: 210000,
@@ -64,9 +63,9 @@ const webFrameMethods = [
   'setZoomLevelLimits'
 ]
 
-let wrapWebContents = function (webContents) {
+// Add JavaScript wrappers for WebContents class.
+const wrapWebContents = function (webContents) {
   // webContents is an EventEmitter.
-  var controller, method, name, ref1
   Object.setPrototypeOf(webContents, EventEmitter.prototype)
 
   // Every remote callback from renderer process would add a listenter to the
@@ -85,21 +84,18 @@ let wrapWebContents = function (webContents) {
   webContents.sendToAll = sendWrapper.bind(null, true)
 
   // The navigation controller.
-  controller = new NavigationController(webContents)
-  ref1 = NavigationController.prototype
-  for (name in ref1) {
-    method = ref1[name]
+  const controller = new NavigationController(webContents)
+  for (const name in NavigationController.prototype) {
+    const method = NavigationController.prototype[name]
     if (method instanceof Function) {
-      (function (name, method) {
-        webContents[name] = function () {
-          return method.apply(controller, arguments)
-        }
-      })(name, method)
+      webContents[name] = function () {
+        return method.apply(controller, arguments)
+      }
     }
   }
 
   // Mapping webFrame methods.
-  for (let method of webFrameMethods) {
+  for (const method of webFrameMethods) {
     webContents[method] = function (...args) {
       this.send('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', method, args)
     }
@@ -115,7 +111,7 @@ let wrapWebContents = function (webContents) {
   // Make sure webContents.executeJavaScript would run the code only when the
   // webContents has been loaded.
   webContents.executeJavaScript = function (code, hasUserGesture, callback) {
-    let requestId = getNextId()
+    const requestId = getNextId()
     if (typeof hasUserGesture === 'function') {
       callback = hasUserGesture
       hasUserGesture = false
@@ -131,18 +127,16 @@ let wrapWebContents = function (webContents) {
 
   // Dispatch IPC messages to the ipc module.
   webContents.on('ipc-message', function (event, [channel, ...args]) {
-    ipcMain.emit.apply(ipcMain, [channel, event].concat(args))
+    ipcMain.emit(channel, event, ...args)
   })
   webContents.on('ipc-message-sync', function (event, [channel, ...args]) {
     Object.defineProperty(event, 'returnValue', {
       set: function (value) {
         return event.sendReply(JSON.stringify(value))
       },
-      get: function () {
-        return undefined
-      }
+      get: function () {}
     })
-    return ipcMain.emit.apply(ipcMain, [channel, event].concat(args))
+    ipcMain.emit(channel, event, ...args)
   })
 
   // Handle context menu action request from pepper plugin.
@@ -164,8 +158,7 @@ let wrapWebContents = function (webContents) {
   })
 
   webContents.printToPDF = function (options, callback) {
-    var printingSetting
-    printingSetting = {
+    const printingSetting = {
       pageRage: [],
       mediaSize: {},
       landscape: false,
@@ -229,13 +222,14 @@ let wrapWebContents = function (webContents) {
   }
 }
 
-// Wrapper for native class.
-let wrapDebugger = function (webContentsDebugger) {
+binding._setWrapWebContents(wrapWebContents)
+
+// Add JavaScript wrappers for Debugger class.
+const wrapDebugger = function (webContentsDebugger) {
   // debugger is an EventEmitter.
   Object.setPrototypeOf(webContentsDebugger, EventEmitter.prototype)
 }
 
-binding._setWrapWebContents(wrapWebContents)
 debuggerBinding._setWrapDebugger(wrapDebugger)
 
 module.exports = {

From a70749e80ae8fbc17f96c6007f3d440af5e38610 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Mon, 30 May 2016 18:08:09 +0530
Subject: [PATCH 502/510] browser: implement bluetooth chooser interface

---
 atom/browser/api/atom_api_web_contents.cc |   9 ++
 atom/browser/api/atom_api_web_contents.h  |   3 +
 atom/browser/bluetooth_chooser.cc         | 107 ++++++++++++++++++++++
 atom/browser/bluetooth_chooser.h          |  45 +++++++++
 filenames.gypi                            |   2 +
 5 files changed, 166 insertions(+)
 create mode 100644 atom/browser/bluetooth_chooser.cc
 create mode 100644 atom/browser/bluetooth_chooser.h

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 736fb7ca0fb1..ab68fafe716d 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -14,6 +14,7 @@
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_security_state_model_client.h"
+#include "atom/browser/bluetooth_chooser.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/web_contents_permission_helper.h"
@@ -504,6 +505,14 @@ void WebContents::RequestToLockMouse(
   permission_helper->RequestPointerLockPermission(user_gesture);
 }
 
+std::unique_ptr<content::BluetoothChooser> WebContents::RunBluetoothChooser(
+    content::RenderFrameHost* frame,
+    const content::BluetoothChooser::EventHandler& event_handler) {
+  std::unique_ptr<BluetoothChooser> bluetooth_chooser(
+      new BluetoothChooser(this, event_handler));
+  return std::move(bluetooth_chooser);
+}
+
 void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
   // Do nothing, we override this method just to avoid compilation error since
   // there are two virtual functions named BeforeUnloadFired.
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index e03ab653a8ce..85c43f1486aa 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -211,6 +211,9 @@ class WebContents : public mate::TrackableObject<WebContents>,
       content::WebContents* web_contents,
       bool user_gesture,
       bool last_unlocked_by_target) override;
+  std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
+      content::RenderFrameHost* frame,
+      const content::BluetoothChooser::EventHandler& handler) override;
 
   // content::WebContentsObserver:
   void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
diff --git a/atom/browser/bluetooth_chooser.cc b/atom/browser/bluetooth_chooser.cc
new file mode 100644
index 000000000000..37c30a36081a
--- /dev/null
+++ b/atom/browser/bluetooth_chooser.cc
@@ -0,0 +1,107 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/bluetooth_chooser.h"
+#include "atom/common/native_mate_converters/callback.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
+#include "native_mate/dictionary.h"
+
+namespace mate {
+
+template<>
+struct Converter<atom::BluetoothChooser::DeviceInfo> {
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate, const atom::BluetoothChooser::DeviceInfo& val) {
+    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+    dict.Set("deviceName", val.device_name);
+    dict.Set("deviceId", val.device_id);
+    return mate::ConvertToV8(isolate, dict);
+  }
+};
+
+}  // namespace mate
+
+namespace atom {
+
+namespace {
+
+const int kMaxScanRetries = 5;
+
+void OnDeviceChosen(
+    const content::BluetoothChooser::EventHandler& handler,
+    const std::string& device_id) {
+  if (device_id.empty()) {
+    handler.Run(content::BluetoothChooser::Event::CANCELLED, device_id);
+  } else {
+    handler.Run(content::BluetoothChooser::Event::SELECTED, device_id);
+  }
+}
+
+}  // namespace
+
+BluetoothChooser::BluetoothChooser(
+    api::WebContents* contents,
+    const EventHandler& event_handler)
+    : api_web_contents_(contents),
+      event_handler_(event_handler),
+      num_retries_(0) {
+}
+
+BluetoothChooser::~BluetoothChooser() {
+}
+
+void BluetoothChooser::SetAdapterPresence(AdapterPresence presence) {
+  switch (presence) {
+    case AdapterPresence::ABSENT:
+    case AdapterPresence::POWERED_OFF:
+      event_handler_.Run(Event::CANCELLED, "");
+      break;
+    case AdapterPresence::POWERED_ON:
+      break;
+  }
+}
+
+void BluetoothChooser::ShowDiscoveryState(DiscoveryState state) {
+  switch (state) {
+    case DiscoveryState::FAILED_TO_START:
+      event_handler_.Run(Event::CANCELLED, "");
+      break;
+    case DiscoveryState::IDLE:
+      if (device_list_.empty()) {
+        auto event = ++num_retries_ > kMaxScanRetries ? Event::CANCELLED
+                                                      : Event::RESCAN;
+        event_handler_.Run(event, "");
+      } else {
+        bool prevent_default =
+            api_web_contents_->Emit("select-bluetooth-device",
+                                    device_list_,
+                                    base::Bind(&OnDeviceChosen,
+                                               event_handler_));
+        if (!prevent_default) {
+          auto device_id = device_list_[0].device_id;
+          event_handler_.Run(Event::SELECTED, device_id);
+        }
+      }
+      break;
+    case DiscoveryState::DISCOVERING:
+      break;
+  }
+}
+
+void BluetoothChooser::AddDevice(const std::string& device_id,
+                                 const base::string16& device_name) {
+  DeviceInfo info = {device_id, device_name};
+  device_list_.push_back(info);
+}
+
+void BluetoothChooser::RemoveDevice(const std::string& device_id) {
+  for (auto it = device_list_.begin(); it != device_list_.end(); ++it) {
+    if (it->device_id == device_id) {
+      device_list_.erase(it);
+      return;
+    }
+  }
+}
+
+}  // namespace atom
diff --git a/atom/browser/bluetooth_chooser.h b/atom/browser/bluetooth_chooser.h
new file mode 100644
index 000000000000..69617191ba46
--- /dev/null
+++ b/atom/browser/bluetooth_chooser.h
@@ -0,0 +1,45 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_BLUETOOTH_CHOOSER_H_
+#define ATOM_BROWSER_BLUETOOTH_CHOOSER_H_
+
+#include <string>
+#include <vector>
+
+#include "atom/browser/api/atom_api_web_contents.h"
+#include "content/public/browser/bluetooth_chooser.h"
+
+namespace atom {
+
+class BluetoothChooser : public content::BluetoothChooser {
+ public:
+  struct DeviceInfo {
+    std::string device_id;
+    base::string16 device_name;
+  };
+
+  explicit BluetoothChooser(api::WebContents* contents,
+                            const EventHandler& handler);
+  ~BluetoothChooser() override;
+
+  // content::BluetoothChooser:
+  void SetAdapterPresence(AdapterPresence presence) override;
+  void ShowDiscoveryState(DiscoveryState state) override;
+  void AddDevice(const std::string& device_id,
+                 const base::string16& device_name) override;
+  void RemoveDevice(const std::string& device_id) override;
+
+ private:
+  std::vector<DeviceInfo> device_list_;
+  api::WebContents* api_web_contents_;
+  EventHandler event_handler_;
+  int num_retries_;
+
+  DISALLOW_COPY_AND_ASSIGN(BluetoothChooser);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_BLUETOOTH_CHOOSER_H_
diff --git a/filenames.gypi b/filenames.gypi
index ae71164a8ab9..66874efc07d6 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -167,6 +167,8 @@
       'atom/browser/atom_security_state_model_client.h',
       'atom/browser/atom_speech_recognition_manager_delegate.cc',
       'atom/browser/atom_speech_recognition_manager_delegate.h',
+      'atom/browser/bluetooth_chooser.cc',
+      'atom/browser/bluetooth_chooser.h',
       'atom/browser/bridge_task_runner.cc',
       'atom/browser/bridge_task_runner.h',
       'atom/browser/browser.cc',

From 51daf8e194d6d5660c29736f6dd1dc07d2ad24ee Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Tue, 31 May 2016 13:37:45 +0530
Subject: [PATCH 503/510] add docs

---
 docs/api/web-contents.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 89d7e1245d77..941879b7f746 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -373,6 +373,22 @@ The `editFlags` is an object with the following properties:
 
 Emitted when there is a new context menu that needs to be handled.
 
+### Event: 'select-bluetooth-device'
+
+Returns:
+
+* `event` Event
+* `devices` [Objects]
+  * `deviceName` String
+  * `deviceId` String
+* `callback` Function
+  * `deviceId` String
+
+Emitted when bluetooth device needs to be selected on call to
+`navigator.bluetooth.requestDevice`. If `event.preventDefault` is not called,
+first available device will be selected. `callback` should be called with `deviceId`
+to be selected.
+
 ## Instance Methods
 
 The `webContents` object has the following instance methods:

From db4dc4757aa85da8c6b46b6c4ea81eff8f9ee895 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Wed, 1 Jun 2016 11:17:21 +0530
Subject: [PATCH 504/510] move bluetooth_chooser to atom/browser/lib

---
 atom/browser/{ => lib}/bluetooth_chooser.cc | 0
 atom/browser/{ => lib}/bluetooth_chooser.h  | 0
 filenames.gypi                              | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename atom/browser/{ => lib}/bluetooth_chooser.cc (100%)
 rename atom/browser/{ => lib}/bluetooth_chooser.h (100%)

diff --git a/atom/browser/bluetooth_chooser.cc b/atom/browser/lib/bluetooth_chooser.cc
similarity index 100%
rename from atom/browser/bluetooth_chooser.cc
rename to atom/browser/lib/bluetooth_chooser.cc
diff --git a/atom/browser/bluetooth_chooser.h b/atom/browser/lib/bluetooth_chooser.h
similarity index 100%
rename from atom/browser/bluetooth_chooser.h
rename to atom/browser/lib/bluetooth_chooser.h
diff --git a/filenames.gypi b/filenames.gypi
index 66874efc07d6..f66b98134c65 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -167,8 +167,6 @@
       'atom/browser/atom_security_state_model_client.h',
       'atom/browser/atom_speech_recognition_manager_delegate.cc',
       'atom/browser/atom_speech_recognition_manager_delegate.h',
-      'atom/browser/bluetooth_chooser.cc',
-      'atom/browser/bluetooth_chooser.h',
       'atom/browser/bridge_task_runner.cc',
       'atom/browser/bridge_task_runner.h',
       'atom/browser/browser.cc',
@@ -183,6 +181,8 @@
       'atom/browser/common_web_contents_delegate.h',
       'atom/browser/javascript_environment.cc',
       'atom/browser/javascript_environment.h',
+      'atom/browser/lib/bluetooth_chooser.cc',
+      'atom/browser/lib/bluetooth_chooser.h',
       'atom/browser/login_handler.cc',
       'atom/browser/login_handler.h',
       'atom/browser/mac/atom_application.h',

From de4bff003f82344efa83f0c183c62e09b824c766 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Wed, 1 Jun 2016 11:24:41 +0530
Subject: [PATCH 505/510] fix header paths and comments

---
 atom/browser/api/atom_api_web_contents.cc | 2 +-
 atom/browser/lib/bluetooth_chooser.cc     | 2 +-
 atom/browser/lib/bluetooth_chooser.h      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index ab68fafe716d..9d93d980be4a 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -14,7 +14,7 @@
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_security_state_model_client.h"
-#include "atom/browser/bluetooth_chooser.h"
+#include "atom/browser/lib/bluetooth_chooser.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/web_contents_permission_helper.h"
diff --git a/atom/browser/lib/bluetooth_chooser.cc b/atom/browser/lib/bluetooth_chooser.cc
index 37c30a36081a..2ed21bd333fd 100644
--- a/atom/browser/lib/bluetooth_chooser.cc
+++ b/atom/browser/lib/bluetooth_chooser.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/bluetooth_chooser.h"
+#include "atom/browser/lib/bluetooth_chooser.h"
 #include "atom/common/native_mate_converters/callback.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "native_mate/dictionary.h"
diff --git a/atom/browser/lib/bluetooth_chooser.h b/atom/browser/lib/bluetooth_chooser.h
index 69617191ba46..615dfcb8c663 100644
--- a/atom/browser/lib/bluetooth_chooser.h
+++ b/atom/browser/lib/bluetooth_chooser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_BLUETOOTH_CHOOSER_H_
-#define ATOM_BROWSER_BLUETOOTH_CHOOSER_H_
+#ifndef ATOM_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
+#define ATOM_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ class BluetoothChooser : public content::BluetoothChooser {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_BLUETOOTH_CHOOSER_H_
+#endif  // ATOM_BROWSER_LIB_BLUETOOTH_CHOOSER_H_

From 743483846344515aa971be3d786d14e3ba125c82 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Wed, 1 Jun 2016 11:39:14 +0530
Subject: [PATCH 506/510] fix docs

---
 docs/api/web-contents.md | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 941879b7f746..2d489c6726a1 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -385,9 +385,29 @@ Returns:
   * `deviceId` String
 
 Emitted when bluetooth device needs to be selected on call to
-`navigator.bluetooth.requestDevice`. If `event.preventDefault` is not called,
-first available device will be selected. `callback` should be called with `deviceId`
-to be selected.
+`navigator.bluetooth.requestDevice`. To use `navigator.bluetooth` api
+`webBluetooth` should be enabled.  If `event.preventDefault` is not called,
+first available device will be selected. `callback` should be called with
+`deviceId` to be selected, passing empty string to `callback` will
+cancel the request.
+
+```javacript
+app.commandLine.appendSwitch('enable-web-bluetooth')
+
+app.on('ready', () => {
+  webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
+    event.preventDefault()
+    let result = deviceList.find((device) => {
+      return device.deviceName === 'test'
+    })
+    if (!result) {
+      callback('')
+    } else {
+      callback(result.deviceId)
+    }
+  })
+})
+```
 
 ## Instance Methods
 

From 0864d3b1ee7370ece474532ffbeda646c2e5ed5e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 15:24:53 +0900
Subject: [PATCH 507/510] Cleanup the printToPDF code

---
 lib/browser/api/web-contents.js | 81 +++++++++++++++++----------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index d7bcdb455b33..ed7bfe0b8bdf 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -15,7 +15,8 @@ const getNextId = function () {
   return ++nextId
 }
 
-const PDFPageSize = {
+// Stock page sizes
+const PDFPageSizes = {
   A5: {
     custom_display_name: 'A5',
     height_microns: 210000,
@@ -55,6 +56,31 @@ const PDFPageSize = {
   }
 }
 
+// Default printing setting
+const defaultPrintingSetting = {
+  pageRage: [],
+  mediaSize: {},
+  landscape: false,
+  color: 2,
+  headerFooterEnabled: false,
+  marginsType: 0,
+  isFirstRequest: false,
+  requestID: getNextId(),
+  previewModifiable: true,
+  printToPDF: true,
+  printWithCloudPrint: false,
+  printWithPrivet: false,
+  printWithExtension: false,
+  deviceName: 'Save as PDF',
+  generateDraftData: true,
+  fitToPageEnabled: false,
+  duplex: 0,
+  copies: 1,
+  collate: true,
+  shouldPrintBackgrounds: false,
+  shouldPrintSelectionOnly: false
+}
+
 // Following methods are mapped to webFrame.
 const webFrameMethods = [
   'insertText',
@@ -158,29 +184,7 @@ const wrapWebContents = function (webContents) {
   })
 
   webContents.printToPDF = function (options, callback) {
-    const printingSetting = {
-      pageRage: [],
-      mediaSize: {},
-      landscape: false,
-      color: 2,
-      headerFooterEnabled: false,
-      marginsType: 0,
-      isFirstRequest: false,
-      requestID: getNextId(),
-      previewModifiable: true,
-      printToPDF: true,
-      printWithCloudPrint: false,
-      printWithPrivet: false,
-      printWithExtension: false,
-      deviceName: 'Save as PDF',
-      generateDraftData: true,
-      fitToPageEnabled: false,
-      duplex: 0,
-      copies: 1,
-      collate: true,
-      shouldPrintBackgrounds: false,
-      shouldPrintSelectionOnly: false
-    }
+    const printingSetting = Object.assign({}, defaultPrintingSetting)
     if (options.landscape) {
       printingSetting.landscape = options.landscape
     }
@@ -195,30 +199,29 @@ const wrapWebContents = function (webContents) {
     }
 
     if (options.pageSize) {
-      let height = 0
-      let width = 0
-      if (typeof options.pageSize === 'object') {
+      const pageSize = options.pageSize
+      if (typeof pageSize === 'object') {
+        if (!pageSize.height || !pageSize.width) {
+          return callback(new Error('Must define height and width for pageSize'))
+        }
         // Dimensions in Microns
         // 1 meter = 10^6 microns
-        height = options.pageSize.height ? options.pageSize.height : 0
-        width = options.pageSize.width ? options.pageSize.width : 0
-      }
-
-      if (height > 0 && width > 0) {
         printingSetting.mediaSize = {
-          height_microns: height,
           name: 'CUSTOM',
-          width_microns: width,
-          custom_display_name: 'Custom'
+          custom_display_name: 'Custom',
+          height_microns: pageSize.height,
+          width_microns: pageSize.width
         }
-      } else if (PDFPageSize[options.pageSize]) {
-        printingSetting.mediaSize = PDFPageSize[options.pageSize]
+      } else if (PDFPageSizes[pageSize]) {
+        printingSetting.mediaSize = PDFPageSizes[pageSize]
       } else {
-        printingSetting.mediaSize = PDFPageSize['A4']
+        return callback(new Error(`Does not support pageSize with ${pageSize}`))
       }
+    } else {
+      printingSetting.mediaSize = PDFPageSizes['A4']
     }
 
-    return this._printToPDF(printingSetting, callback)
+    this._printToPDF(printingSetting, callback)
   }
 }
 

From 01b10b3b39d3e34f6aedbeaa431d18afdd58d060 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 15:27:17 +0900
Subject: [PATCH 508/510] Slightly improve docs of webContents.printToPDF

---
 docs/api/web-contents.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 89d7e1245d77..ca9cf43c468f 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -655,7 +655,8 @@ size.
   * `marginsType` Integer - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
   * `pageSize` String - Specify page size of the generated PDF. Can be `A3`,
-    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` & `width` in Microns.
+    `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
+    and `width` in microns.
   * `printBackground` Boolean - Whether to print CSS backgrounds.
   * `printSelectionOnly` Boolean - Whether to print selection only.
   * `landscape` Boolean - `true` for landscape, `false` for portrait.
@@ -678,6 +679,8 @@ By default, an empty `options` will be regarded as:
 }
 ```
 
+An example of `webContents.printToPDF`:
+
 ```javascript
 const {BrowserWindow} = require('electron');
 const fs = require('fs');

From 97dd71d79e67a4a5769f65cfa44def05ba16127d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 1 Jun 2016 16:15:53 +0900
Subject: [PATCH 509/510] Bump v1.2.1

---
 atom/browser/resources/mac/Info.plist | 4 ++--
 atom/browser/resources/win/atom.rc    | 8 ++++----
 atom/common/atom_version.h            | 2 +-
 electron.gyp                          | 2 +-
 package.json                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index f1c6b4137061..28eddfa61235 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>electron.icns</string>
   <key>CFBundleVersion</key>
-  <string>1.2.0</string>
+  <string>1.2.1</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.2.0</string>
+  <string>1.2.1</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
diff --git a/atom/browser/resources/win/atom.rc b/atom/browser/resources/win/atom.rc
index 701e6fe29480..7e386d319d9d 100644
--- a/atom/browser/resources/win/atom.rc
+++ b/atom/browser/resources/win/atom.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,2,1,0
+ PRODUCTVERSION 1,2,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "1.2.0"
+            VALUE "FileVersion", "1.2.1"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "1.2.0"
+            VALUE "ProductVersion", "1.2.1"
             VALUE "SquirrelAwareVersion", "1"
         END
     END
diff --git a/atom/common/atom_version.h b/atom/common/atom_version.h
index cf2ef14d8ccd..455bfacbfc11 100644
--- a/atom/common/atom_version.h
+++ b/atom/common/atom_version.h
@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 1
 #define ATOM_MINOR_VERSION 2
-#define ATOM_PATCH_VERSION 0
+#define ATOM_PATCH_VERSION 1
 
 #define ATOM_VERSION_IS_RELEASE 1
 
diff --git a/electron.gyp b/electron.gyp
index c11444121531..055cb0c209ac 100644
--- a/electron.gyp
+++ b/electron.gyp
@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '1.2.0',
+    'version%': '1.2.1',
   },
   'includes': [
     'filenames.gypi',
diff --git a/package.json b/package.json
index d96ed1cd42ad..6f873786e3f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "devDependencies": {
     "asar": "^0.11.0",
     "request": "*",

From 789a878f07e7a329524859e9cd113aa65086f01b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 1 Jun 2016 13:16:53 -0700
Subject: [PATCH 510/510] Rename atom-shell-frameworks repo name and org

---
 script/update-external-binaries.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py
index c70860707e86..470f735fdb42 100755
--- a/script/update-external-binaries.py
+++ b/script/update-external-binaries.py
@@ -10,7 +10,7 @@ from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
 
 VERSION = 'v1.0.0'
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-FRAMEWORKS_URL = 'http://github.com/atom/atom-shell-frameworks/releases' \
+FRAMEWORKS_URL = 'http://github.com/electron/electron-frameworks/releases' \
                  '/download/' + VERSION