From bb938b02d8f3b32079c4d555e50df6b9647df43b Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Sat, 3 Oct 2015 09:02:50 -0700
Subject: [PATCH 01/30] Remove Vista as possibly working

Vista crashes on startup because Win7 touch APIs aren't present - this is fine, but we want to tell people out of the gate that it won't work
---
 docs/tutorial/supported-platforms.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/supported-platforms.md b/docs/tutorial/supported-platforms.md
index 8b795769a87..f74ccf2ec25 100644
--- a/docs/tutorial/supported-platforms.md
+++ b/docs/tutorial/supported-platforms.md
@@ -8,9 +8,9 @@ Only 64bit binaries are provided for OS X, and the minimum OS X version supporte
 
 ### Windows
 
-Windows 7 and later are supported, Electron should be able to run on Windows Vista, but there is no testing done on it.
+Windows 7 and later are supported, older operating systems are not supported (and do not work).
 
-Both `x86` and `x64` binaries are provided for Windows, and `ARM` version of Windows is not supported for now.
+Both `x86` and `amd64` (x64) binaries are provided for Windows, and `ARM` version of Windows is not supported for now.
 
 ### Linux
 

From 8577f2b52f42335747101123b4fe9e5fa77f1bd8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 16:19:01 +0800
Subject: [PATCH 02/30] osx: Add NativeWindow::SetSizeConstraints

---
 atom/browser/native_window.cc                 | 69 +++++++++++++++
 atom/browser/native_window.h                  | 26 ++++--
 atom/browser/native_window_mac.h              | 12 +--
 atom/browser/native_window_mac.mm             | 77 +++++++----------
 atom/browser/native_window_views.cc           | 16 ++++
 atom/browser/native_window_views.h            |  6 ++
 .../browser/app_window/size_constraints.cc    | 83 +++++++++++++++++++
 .../browser/app_window/size_constraints.h     | 57 +++++++++++++
 filenames.gypi                                |  2 +
 9 files changed, 287 insertions(+), 61 deletions(-)
 create mode 100644 chromium_src/extensions/browser/app_window/size_constraints.cc
 create mode 100644 chromium_src/extensions/browser/app_window/size_constraints.h

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 80a7d1347f3..cad6942d2e9 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -162,6 +162,14 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
     Show();
 }
 
+gfx::Size NativeWindow::ContentSizeToWindowSize(const gfx::Size& size) {
+  return size;
+}
+
+gfx::Size NativeWindow::WindowSizeToContentSize(const gfx::Size& size) {
+  return size;
+}
+
 void NativeWindow::SetSize(const gfx::Size& size) {
   SetBounds(gfx::Rect(GetPosition(), size));
 }
@@ -178,6 +186,67 @@ gfx::Point NativeWindow::GetPosition() {
   return GetBounds().origin();
 }
 
+void NativeWindow::SetContentSize(const gfx::Size& size) {
+  SetSize(ContentSizeToWindowSize(size));
+}
+
+gfx::Size NativeWindow::GetContentSize() {
+  return WindowSizeToContentSize(GetSize());
+}
+
+void NativeWindow::SetSizeConstraints(
+    const extensions::SizeConstraints& window_constraints) {
+  extensions::SizeConstraints content_constraints;
+  if (window_constraints.HasMaximumSize())
+    content_constraints.set_maximum_size(
+        WindowSizeToContentSize(window_constraints.GetMaximumSize()));
+  if (window_constraints.HasMinimumSize())
+    content_constraints.set_minimum_size(
+        WindowSizeToContentSize(window_constraints.GetMinimumSize()));
+  SetContentSizeConstraints(content_constraints);
+}
+
+extensions::SizeConstraints NativeWindow::GetSizeConstraints() {
+  extensions::SizeConstraints content_constraints = GetContentSizeConstraints();
+  extensions::SizeConstraints window_constraints;
+  if (content_constraints.HasMaximumSize())
+    window_constraints.set_maximum_size(
+        ContentSizeToWindowSize(content_constraints.GetMaximumSize()));
+  if (content_constraints.HasMinimumSize())
+    window_constraints.set_minimum_size(
+        ContentSizeToWindowSize(content_constraints.GetMinimumSize()));
+  return window_constraints;
+}
+
+void NativeWindow::SetContentSizeConstraints(
+    const extensions::SizeConstraints& size_constraints) {
+  size_constraints_ = size_constraints;
+}
+
+extensions::SizeConstraints NativeWindow::GetContentSizeConstraints() {
+  return size_constraints_;
+}
+
+void NativeWindow::SetMinimumSize(const gfx::Size& size) {
+  extensions::SizeConstraints size_constraints;
+  size_constraints.set_minimum_size(size);
+  SetSizeConstraints(size_constraints);
+}
+
+gfx::Size NativeWindow::GetMinimumSize() {
+  return GetSizeConstraints().GetMinimumSize();
+}
+
+void NativeWindow::SetMaximumSize(const gfx::Size& size) {
+  extensions::SizeConstraints size_constraints;
+  size_constraints.set_maximum_size(size);
+  SetSizeConstraints(size_constraints);
+}
+
+gfx::Size NativeWindow::GetMaximumSize() {
+  return GetSizeConstraints().GetMaximumSize();
+}
+
 void NativeWindow::SetRepresentedFilename(const std::string& filename) {
 }
 
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 751644e4595..53878330646 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -19,6 +19,7 @@
 #include "content/public/browser/readback_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
+#include "extensions/browser/app_window/size_constraints.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -110,12 +111,18 @@ class NativeWindow : public base::SupportsUserData,
   virtual gfx::Size GetSize();
   virtual void SetPosition(const gfx::Point& position);
   virtual gfx::Point GetPosition();
-  virtual void SetContentSize(const gfx::Size& size) = 0;
-  virtual gfx::Size GetContentSize() = 0;
-  virtual void SetMinimumSize(const gfx::Size& size) = 0;
-  virtual gfx::Size GetMinimumSize() = 0;
-  virtual void SetMaximumSize(const gfx::Size& size) = 0;
-  virtual gfx::Size GetMaximumSize() = 0;
+  virtual void SetContentSize(const gfx::Size& size);
+  virtual gfx::Size GetContentSize();
+  virtual void SetSizeConstraints(
+      const extensions::SizeConstraints& size_constraints);
+  virtual extensions::SizeConstraints GetSizeConstraints();
+  virtual void SetContentSizeConstraints(
+      const extensions::SizeConstraints& size_constraints);
+  virtual extensions::SizeConstraints GetContentSizeConstraints();
+  virtual void SetMinimumSize(const gfx::Size& size);
+  virtual gfx::Size GetMinimumSize();
+  virtual void SetMaximumSize(const gfx::Size& size);
+  virtual gfx::Size GetMaximumSize();
   virtual void SetResizable(bool resizable) = 0;
   virtual bool IsResizable() = 0;
   virtual void SetAlwaysOnTop(bool top) = 0;
@@ -234,6 +241,10 @@ class NativeWindow : public base::SupportsUserData,
   NativeWindow(brightray::InspectableWebContents* inspectable_web_contents,
                const mate::Dictionary& options);
 
+  // Converts between content size to window size.
+  virtual gfx::Size ContentSizeToWindowSize(const gfx::Size& size);
+  virtual gfx::Size WindowSizeToContentSize(const gfx::Size& size);
+
   // content::WebContentsObserver:
   void RenderViewCreated(content::RenderViewHost* render_view_host) override;
   void BeforeUnloadDialogCancelled() override;
@@ -269,6 +280,9 @@ class NativeWindow : public base::SupportsUserData,
   // has to been explicitly provided.
   scoped_ptr<SkRegion> draggable_region_;  // used in custom drag.
 
+  // Minimum and maximum size, stored as content size.
+  extensions::SizeConstraints size_constraints_;
+
   // Whether window can be resized larger than screen.
   bool enable_larger_than_screen_;
 
diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index 20ad6053149..60581a2d977 100644
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -44,12 +44,8 @@ class NativeWindowMac : public NativeWindow {
   bool IsFullscreen() const override;
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Rect GetBounds() override;
-  void SetContentSize(const gfx::Size& size) override;
-  gfx::Size GetContentSize() override;
-  void SetMinimumSize(const gfx::Size& size) override;
-  gfx::Size GetMinimumSize() override;
-  void SetMaximumSize(const gfx::Size& size) override;
-  gfx::Size GetMaximumSize() override;
+  void SetContentSizeConstraints(
+      const extensions::SizeConstraints& size_constraints) override;
   void SetResizable(bool resizable) override;
   bool IsResizable() override;
   void SetAlwaysOnTop(bool top) override;
@@ -89,6 +85,10 @@ class NativeWindowMac : public NativeWindow {
       const content::NativeWebKeyboardEvent&) override;
 
  private:
+  // NativeWindow:
+  gfx::Size ContentSizeToWindowSize(const gfx::Size& size) override;
+  gfx::Size WindowSizeToContentSize(const gfx::Size& size) override;
+
   void InstallView();
   void UninstallView();
 
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 3e8dab2133c..76f9b0d0de0 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -22,6 +22,11 @@
 
 namespace {
 
+// Converts gfx::Size to NSSize.
+inline NSSize ToNSSize(const gfx::Size& size) {
+  return NSMakeSize(size.width(), size.height());
+}
+
 // Prevents window from resizing during the scope.
 class ScopedDisableResize {
  public:
@@ -549,56 +554,18 @@ gfx::Rect NativeWindowMac::GetBounds() {
   return bounds;
 }
 
-void NativeWindowMac::SetContentSize(const gfx::Size& size) {
-  if (!has_frame()) {
-    SetSize(size);
-    return;
+void NativeWindowMac::SetContentSizeConstraints(
+    const extensions::SizeConstraints& size_constraints) {
+  NSView* content = [window_ contentView];
+  if (size_constraints.HasMinimumSize()) {
+    NSSize min_size = ToNSSize(size_constraints.GetMinimumSize());
+    [window_ setMinSize:[content convertSize:min_size toView:nil]];
   }
-
-  NSRect frame_nsrect = [window_ frame];
-  NSSize frame = frame_nsrect.size;
-  NSSize content = [window_ contentRectForFrameRect:frame_nsrect].size;
-
-  int width = size.width() + frame.width - content.width;
-  int height = size.height() + frame.height - content.height;
-  frame_nsrect.origin.y -= height - frame_nsrect.size.height;
-  frame_nsrect.size.width = width;
-  frame_nsrect.size.height = height;
-  [window_ setFrame:frame_nsrect display:YES];
-}
-
-gfx::Size NativeWindowMac::GetContentSize() {
-  if (!has_frame())
-    return GetSize();
-
-  NSRect bounds = [[window_ contentView] bounds];
-  return gfx::Size(bounds.size.width, bounds.size.height);
-}
-
-void NativeWindowMac::SetMinimumSize(const gfx::Size& size) {
-  NSSize min_size = NSMakeSize(size.width(), size.height());
-  NSView* content = [window_ contentView];
-  [window_ setContentMinSize:[content convertSize:min_size toView:nil]];
-}
-
-gfx::Size NativeWindowMac::GetMinimumSize() {
-  NSView* content = [window_ contentView];
-  NSSize min_size = [content convertSize:[window_ contentMinSize]
-                                fromView:nil];
-  return gfx::Size(min_size.width, min_size.height);
-}
-
-void NativeWindowMac::SetMaximumSize(const gfx::Size& size) {
-  NSSize max_size = NSMakeSize(size.width(), size.height());
-  NSView* content = [window_ contentView];
-  [window_ setContentMaxSize:[content convertSize:max_size toView:nil]];
-}
-
-gfx::Size NativeWindowMac::GetMaximumSize() {
-  NSView* content = [window_ contentView];
-  NSSize max_size = [content convertSize:[window_ contentMaxSize]
-                                fromView:nil];
-  return gfx::Size(max_size.width, max_size.height);
+  if (size_constraints.HasMaximumSize()) {
+    NSSize max_size = ToNSSize(size_constraints.GetMaximumSize());
+    [window_ setMaxSize:[content convertSize:max_size toView:nil]];
+  }
+  NativeWindow::SetContentSizeConstraints(size_constraints);
 }
 
 void NativeWindowMac::SetResizable(bool resizable) {
@@ -821,6 +788,18 @@ void NativeWindowMac::HandleKeyboardEvent(
   }
 }
 
+gfx::Size NativeWindowMac::ContentSizeToWindowSize(const gfx::Size& size) {
+  NSRect content = NSMakeRect(0, 0, size.width(), size.height());
+  NSRect frame = [window_ frameRectForContentRect:content];
+  return gfx::Size(frame.size);
+}
+
+gfx::Size NativeWindowMac::WindowSizeToContentSize(const gfx::Size& size) {
+  NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
+  NSRect content = [window_ contentRectForFrameRect:frame];
+  return gfx::Size(content.size);
+}
+
 void NativeWindowMac::InstallView() {
   // Make sure the bottom corner is rounded: http://crbug.com/396264.
   [[window_ contentView] setWantsLayer:YES];
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index f9e2089a4ef..1c7546854ee 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -440,6 +440,22 @@ gfx::Rect NativeWindowViews::GetBounds() {
   return window_->GetWindowBoundsInScreen();
 }
 
+void NativeWindowViews::SetSizeConstraints(
+    const extensions::SizeConstraints& size_constraints) {
+}
+
+extensions::SizeConstraints NativeWindowViews::GetSizeConstraints() {
+  return extensions::SizeConstraints();
+}
+
+void NativeWindowViews::SetContentSizeConstraints(
+    const extensions::SizeConstraints& size_constraints) {
+}
+
+extensions::SizeConstraints NativeWindowViews::GetContentSizeConstraints() {
+  return extensions::SizeConstraints();
+}
+
 void NativeWindowViews::SetContentSize(const gfx::Size& size) {
   if (!has_frame()) {
     NativeWindow::SetSize(size);
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 2b2322f1959..5a90e6a2213 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -63,6 +63,12 @@ class NativeWindowViews : public NativeWindow,
   bool IsFullscreen() const override;
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Rect GetBounds() override;
+  void SetSizeConstraints(
+      const extensions::SizeConstraints& size_constraints) override;
+  extensions::SizeConstraints GetSizeConstraints() override;
+  void SetContentSizeConstraints(
+      const extensions::SizeConstraints& size_constraints) override;
+  extensions::SizeConstraints GetContentSizeConstraints() override;
   void SetContentSize(const gfx::Size& size) override;
   gfx::Size GetContentSize() override;
   void SetMinimumSize(const gfx::Size& size) override;
diff --git a/chromium_src/extensions/browser/app_window/size_constraints.cc b/chromium_src/extensions/browser/app_window/size_constraints.cc
new file mode 100644
index 00000000000..6d248c16017
--- /dev/null
+++ b/chromium_src/extensions/browser/app_window/size_constraints.cc
@@ -0,0 +1,83 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "extensions/browser/app_window/size_constraints.h"
+
+#include <algorithm>
+
+#include "ui/gfx/geometry/insets.h"
+
+namespace extensions {
+
+SizeConstraints::SizeConstraints()
+    : maximum_size_(kUnboundedSize, kUnboundedSize) {}
+
+SizeConstraints::SizeConstraints(const gfx::Size& min_size,
+                                 const gfx::Size& max_size)
+    : minimum_size_(min_size), maximum_size_(max_size) {}
+
+SizeConstraints::~SizeConstraints() {}
+
+// static
+gfx::Size SizeConstraints::AddFrameToConstraints(
+    const gfx::Size& size_constraints,
+    const gfx::Insets& frame_insets) {
+  return gfx::Size(
+      size_constraints.width() == kUnboundedSize
+          ? kUnboundedSize
+          : size_constraints.width() + frame_insets.width(),
+      size_constraints.height() == kUnboundedSize
+          ? kUnboundedSize
+          : size_constraints.height() + frame_insets.height());
+}
+
+gfx::Size SizeConstraints::ClampSize(gfx::Size size) const {
+  const gfx::Size max_size = GetMaximumSize();
+  if (max_size.width() != kUnboundedSize)
+    size.set_width(std::min(size.width(), max_size.width()));
+  if (max_size.height() != kUnboundedSize)
+    size.set_height(std::min(size.height(), max_size.height()));
+  size.SetToMax(GetMinimumSize());
+  return size;
+}
+
+bool SizeConstraints::HasMinimumSize() const {
+  const gfx::Size min_size = GetMinimumSize();
+  return min_size.width() != kUnboundedSize ||
+         min_size.height() != kUnboundedSize;
+}
+
+bool SizeConstraints::HasMaximumSize() const {
+  const gfx::Size max_size = GetMaximumSize();
+  return max_size.width() != kUnboundedSize ||
+         max_size.height() != kUnboundedSize;
+}
+
+bool SizeConstraints::HasFixedSize() const {
+  return !GetMinimumSize().IsEmpty() && GetMinimumSize() == GetMaximumSize();
+}
+
+gfx::Size SizeConstraints::GetMinimumSize() const {
+  return minimum_size_;
+}
+
+gfx::Size SizeConstraints::GetMaximumSize() const {
+  return gfx::Size(
+      maximum_size_.width() == kUnboundedSize
+          ? kUnboundedSize
+          : std::max(maximum_size_.width(), minimum_size_.width()),
+      maximum_size_.height() == kUnboundedSize
+          ? kUnboundedSize
+          : std::max(maximum_size_.height(), minimum_size_.height()));
+}
+
+void SizeConstraints::set_minimum_size(const gfx::Size& min_size) {
+  minimum_size_ = min_size;
+}
+
+void SizeConstraints::set_maximum_size(const gfx::Size& max_size) {
+  maximum_size_ = max_size;
+}
+
+}  // namespace extensions
diff --git a/chromium_src/extensions/browser/app_window/size_constraints.h b/chromium_src/extensions/browser/app_window/size_constraints.h
new file mode 100644
index 00000000000..ecacf1e5eb1
--- /dev/null
+++ b/chromium_src/extensions/browser/app_window/size_constraints.h
@@ -0,0 +1,57 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef EXTENSIONS_BROWSER_APP_WINDOW_SIZE_CONSTRAINTS_H_
+#define EXTENSIONS_BROWSER_APP_WINDOW_SIZE_CONSTRAINTS_H_
+
+#include "ui/gfx/geometry/size.h"
+
+namespace gfx {
+class Insets;
+}
+
+namespace extensions {
+
+class SizeConstraints {
+ public:
+  // The value SizeConstraints uses to represent an unbounded width or height.
+  // This is an enum so that it can be declared inline here.
+  enum { kUnboundedSize = 0 };
+
+  SizeConstraints();
+  SizeConstraints(const gfx::Size& min_size, const gfx::Size& max_size);
+  ~SizeConstraints();
+
+  // Adds frame insets to a size constraint.
+  static gfx::Size AddFrameToConstraints(const gfx::Size& size_constraints,
+                                         const gfx::Insets& frame_insets);
+
+  // Returns the bounds with its size clamped to the min/max size.
+  gfx::Size ClampSize(gfx::Size size) const;
+
+  // When gfx::Size is used as a min/max size, a zero represents an unbounded
+  // component. This method checks whether either component is specified.
+  // Note we can't use gfx::Size::IsEmpty as it returns true if either width
+  // or height is zero.
+  bool HasMinimumSize() const;
+  bool HasMaximumSize() const;
+
+  // This returns true if all components are specified, and min and max are
+  // equal.
+  bool HasFixedSize() const;
+
+  gfx::Size GetMaximumSize() const;
+  gfx::Size GetMinimumSize() const;
+
+  void set_minimum_size(const gfx::Size& min_size);
+  void set_maximum_size(const gfx::Size& max_size);
+
+ private:
+  gfx::Size minimum_size_;
+  gfx::Size maximum_size_;
+};
+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_BROWSER_APP_WINDOW_SIZE_CONSTRAINTS_H_
diff --git a/filenames.gypi b/filenames.gypi
index 04b82992bc3..a6e799cd67c 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -429,6 +429,8 @@
       'chromium_src/chrome/renderer/tts_dispatcher.cc',
       'chromium_src/chrome/renderer/tts_dispatcher.h',
       'chromium_src/chrome/utility/utility_message_handler.h',
+      'chromium_src/extensions/browser/app_window/size_constraints.cc',
+      'chromium_src/extensions/browser/app_window/size_constraints.h',
       'chromium_src/library_loaders/libspeechd_loader.cc',
       'chromium_src/library_loaders/libspeechd.h',
       'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc',

From a76ea00249286b791a3308230ea7179516ef38d0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 19:05:59 +0800
Subject: [PATCH 03/30] views: Implement NativeWindow::SetSizeConstraints

---
 atom/browser/native_window_views.cc        | 139 +++++++++------------
 atom/browser/native_window_views.h         |  22 +---
 atom/browser/ui/views/frameless_view.cc    |   4 +-
 atom/browser/ui/views/native_frame_view.cc |   5 +-
 atom/browser/ui/views/native_frame_view.h  |   6 +-
 atom/browser/ui/views/win_frame_view.cc    |   4 +-
 6 files changed, 71 insertions(+), 109 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 1c7546854ee..fdcbe42205b 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -186,7 +186,8 @@ NativeWindowViews::NativeWindowViews(
     // will not allow us to resize the window larger than scree.
     // Setting directly to INT_MAX somehow doesn't work, so we just devide
     // by 10, which should still be large enough.
-    maximum_size_.SetSize(INT_MAX / 10, INT_MAX / 10);
+    SetContentSizeConstraints(extensions::SizeConstraints(
+        gfx::Size(), gfx::Size(INT_MAX / 10, INT_MAX / 10)));
 
   int width = 800, height = 600;
   options.Get(switches::kWidth, &width);
@@ -271,11 +272,6 @@ NativeWindowViews::NativeWindowViews(
   set_background(views::Background::CreateStandardPanelBackground());
   AddChildView(web_view_);
 
-  if (has_frame() &&
-      options.Get(switches::kUseContentSize, &use_content_size_) &&
-      use_content_size_)
-    bounds = ContentBoundsToWindowBounds(bounds);
-
 #if defined(OS_WIN)
   // Save initial window state.
   if (fullscreen)
@@ -316,8 +312,14 @@ NativeWindowViews::NativeWindowViews(
   if (transparent() && !has_frame())
     wm::SetShadowType(GetNativeWindow(), wm::SHADOW_TYPE_NONE);
 
+  gfx::Size size = bounds.size();
+  if (has_frame() &&
+      options.Get(switches::kUseContentSize, &use_content_size_) &&
+      use_content_size_)
+    size = ContentSizeToWindowSize(size);
+
   window_->UpdateWindowIcon();
-  window_->CenterWindow(bounds.size());
+  window_->CenterWindow(size);
   Layout();
 }
 
@@ -440,60 +442,6 @@ gfx::Rect NativeWindowViews::GetBounds() {
   return window_->GetWindowBoundsInScreen();
 }
 
-void NativeWindowViews::SetSizeConstraints(
-    const extensions::SizeConstraints& size_constraints) {
-}
-
-extensions::SizeConstraints NativeWindowViews::GetSizeConstraints() {
-  return extensions::SizeConstraints();
-}
-
-void NativeWindowViews::SetContentSizeConstraints(
-    const extensions::SizeConstraints& size_constraints) {
-}
-
-extensions::SizeConstraints NativeWindowViews::GetContentSizeConstraints() {
-  return extensions::SizeConstraints();
-}
-
-void NativeWindowViews::SetContentSize(const gfx::Size& size) {
-  if (!has_frame()) {
-    NativeWindow::SetSize(size);
-    return;
-  }
-
-  gfx::Rect bounds = window_->GetWindowBoundsInScreen();
-  bounds.set_size(size);
-  SetBounds(ContentBoundsToWindowBounds(bounds));
-}
-
-gfx::Size NativeWindowViews::GetContentSize() {
-  if (!has_frame())
-    return GetSize();
-
-  gfx::Size content_size =
-      window_->non_client_view()->frame_view()->GetBoundsForClientView().size();
-  if (menu_bar_ && menu_bar_visible_)
-    content_size.set_height(content_size.height() - kMenuBarHeight);
-  return content_size;
-}
-
-void NativeWindowViews::SetMinimumSize(const gfx::Size& size) {
-  minimum_size_ = size;
-}
-
-gfx::Size NativeWindowViews::GetMinimumSize() {
-  return minimum_size_;
-}
-
-void NativeWindowViews::SetMaximumSize(const gfx::Size& size) {
-  maximum_size_ = size;
-}
-
-gfx::Size NativeWindowViews::GetMaximumSize() {
-  return maximum_size_;
-}
-
 void NativeWindowViews::SetResizable(bool resizable) {
 #if defined(OS_WIN)
   // WS_MAXIMIZEBOX => Maximize button
@@ -929,6 +877,47 @@ gfx::Size NativeWindowViews::WindowSizeToFramelessSize(
   return window_bounds.size();
 }
 
+gfx::Size NativeWindowViews::ContentSizeToWindowSize(const gfx::Size& size) {
+  if (!has_frame())
+    return size;
+
+  gfx::Size window_size(size);
+#if defined(OS_WIN)
+  gfx::Rect dpi_bounds =
+      gfx::Rect(gfx::Point(), gfx::win::DIPToScreenSize(size));
+  gfx::Rect window_bounds = gfx::win::ScreenToDIPRect(
+      window_->non_client_view()->GetWindowBoundsForClientBounds(dpi_bounds));
+  window_size = window_bounds.size();
+#endif
+
+  if (menu_bar_ && menu_bar_visible_)
+    window_size.set_height(window_size.height() + kMenuBarHeight);
+  return window_size;
+}
+
+gfx::Size NativeWindowViews::WindowSizeToContentSize(const gfx::Size& size) {
+  if (!has_frame())
+    return size;
+
+  gfx::Size content_size(size);
+#if defined(OS_WIN)
+  content_size = gfx::win::DIPToScreenSize(content_size);
+  RECT rect;
+  SetRectEmpty(&rect);
+  HWND hwnd = GetAcceleratedWidget();
+  DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
+  DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
+  AdjustWindowRectEx(&rect, style, FALSE, ex_style);
+  content_size.set_width(content_size.width() - (rect.right - rect.left));
+  content_size.set_height(content_size.height() - (rect.bottom - rect.top));
+  content_size = gfx::win::ScreenToDIPSize(content_size);
+#endif
+
+  if (menu_bar_ && menu_bar_visible_)
+    content_size.set_height(content_size.height() - kMenuBarHeight);
+  return content_size;
+}
+
 void NativeWindowViews::HandleKeyboardEvent(
     content::WebContents*,
     const content::NativeWebKeyboardEvent& event) {
@@ -970,6 +959,14 @@ void NativeWindowViews::HandleKeyboardEvent(
   }
 }
 
+gfx::Size NativeWindowViews::GetMinimumSize() {
+  return NativeWindow::GetMinimumSize();
+}
+
+gfx::Size NativeWindowViews::GetMaximumSize() {
+  return NativeWindow::GetMaximumSize();
+}
+
 bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
   return accelerator_util::TriggerAcceleratorTableCommand(
       &accelerator_table_, accelerator);
@@ -992,26 +989,6 @@ void NativeWindowViews::RegisterAccelerators(ui::MenuModel* menu_model) {
   }
 }
 
-gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
-    const gfx::Rect& bounds) {
-  gfx::Point origin = bounds.origin();
-#if defined(OS_WIN)
-  gfx::Rect dpi_bounds = gfx::win::DIPToScreenRect(bounds);
-  gfx::Rect window_bounds = gfx::win::ScreenToDIPRect(
-      window_->non_client_view()->GetWindowBoundsForClientBounds(dpi_bounds));
-#else
-  gfx::Rect window_bounds =
-      window_->non_client_view()->GetWindowBoundsForClientBounds(bounds);
-#endif
-  // The window's position would also be changed, but we only want to change
-  // the size.
-  window_bounds.set_origin(origin);
-
-  if (menu_bar_ && menu_bar_visible_)
-    window_bounds.set_height(window_bounds.height() + kMenuBarHeight);
-  return window_bounds;
-}
-
 ui::WindowShowState NativeWindowViews::GetRestoredState() {
   if (IsMaximized())
     return ui::SHOW_STATE_MAXIMIZED;
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 5a90e6a2213..0e74410868e 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -63,18 +63,6 @@ class NativeWindowViews : public NativeWindow,
   bool IsFullscreen() const override;
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Rect GetBounds() override;
-  void SetSizeConstraints(
-      const extensions::SizeConstraints& size_constraints) override;
-  extensions::SizeConstraints GetSizeConstraints() override;
-  void SetContentSizeConstraints(
-      const extensions::SizeConstraints& size_constraints) override;
-  extensions::SizeConstraints GetContentSizeConstraints() override;
-  void SetContentSize(const gfx::Size& size) override;
-  gfx::Size GetContentSize() override;
-  void SetMinimumSize(const gfx::Size& size) override;
-  gfx::Size GetMinimumSize() override;
-  void SetMaximumSize(const gfx::Size& size) override;
-  gfx::Size GetMaximumSize() override;
   void SetResizable(bool resizable) override;
   bool IsResizable() override;
   void SetAlwaysOnTop(bool top) override;
@@ -148,20 +136,20 @@ class NativeWindowViews : public NativeWindow,
 #endif
 
   // NativeWindow:
+  gfx::Size ContentSizeToWindowSize(const gfx::Size& size) override;
+  gfx::Size WindowSizeToContentSize(const gfx::Size& size) override;
   void HandleKeyboardEvent(
       content::WebContents*,
       const content::NativeWebKeyboardEvent& event) override;
 
   // views::View:
+  gfx::Size GetMinimumSize() override;
+  gfx::Size GetMaximumSize() override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 
   // Register accelerators supported by the menu model.
   void RegisterAccelerators(ui::MenuModel* menu_model);
 
-  // Converts between client area and window area, since we include the menu bar
-  // in client area we need to substract/add menu bar's height in convertions.
-  gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& content_bounds);
-
   // Returns the restore state for the window.
   ui::WindowShowState GetRestoredState();
 
@@ -203,8 +191,6 @@ class NativeWindowViews : public NativeWindow,
   bool use_content_size_;
   bool resizable_;
   std::string title_;
-  gfx::Size minimum_size_;
-  gfx::Size maximum_size_;
   gfx::Size widget_size_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWindowViews);
diff --git a/atom/browser/ui/views/frameless_view.cc b/atom/browser/ui/views/frameless_view.cc
index 03a31e08287..f5e28025e9b 100644
--- a/atom/browser/ui/views/frameless_view.cc
+++ b/atom/browser/ui/views/frameless_view.cc
@@ -104,11 +104,11 @@ gfx::Size FramelessView::GetPreferredSize() const {
 }
 
 gfx::Size FramelessView::GetMinimumSize() const {
-  return window_->GetMinimumSize();
+  return static_cast<NativeWindow*>(window_)->GetMinimumSize();
 }
 
 gfx::Size FramelessView::GetMaximumSize() const {
-  return window_->GetMaximumSize();
+  return static_cast<NativeWindow*>(window_)->GetMaximumSize();
 }
 
 const char* FramelessView::GetClassName() const {
diff --git a/atom/browser/ui/views/native_frame_view.cc b/atom/browser/ui/views/native_frame_view.cc
index a434fb43496..134255f4845 100644
--- a/atom/browser/ui/views/native_frame_view.cc
+++ b/atom/browser/ui/views/native_frame_view.cc
@@ -4,7 +4,7 @@
 
 #include "atom/browser/ui/views/native_frame_view.h"
 
-#include "atom/browser/native_window_views.h"
+#include "atom/browser/native_window.h"
 
 namespace atom {
 
@@ -14,8 +14,7 @@ const char kViewClassName[] = "AtomNativeFrameView";
 
 }  // namespace
 
-NativeFrameView::NativeFrameView(NativeWindowViews* window,
-                                 views::Widget* widget)
+NativeFrameView::NativeFrameView(NativeWindow* window, views::Widget* widget)
     : views::NativeFrameView(widget),
       window_(window) {
 }
diff --git a/atom/browser/ui/views/native_frame_view.h b/atom/browser/ui/views/native_frame_view.h
index acbe9cddc8d..670459f1cbd 100644
--- a/atom/browser/ui/views/native_frame_view.h
+++ b/atom/browser/ui/views/native_frame_view.h
@@ -9,13 +9,13 @@
 
 namespace atom {
 
-class NativeWindowViews;
+class NativeWindow;
 
 // Like the views::NativeFrameView, but returns the min/max size from the
 // NativeWindowViews.
 class NativeFrameView : public views::NativeFrameView {
  public:
-  NativeFrameView(NativeWindowViews* window, views::Widget* widget);
+  NativeFrameView(NativeWindow* window, views::Widget* widget);
 
  protected:
   // views::View:
@@ -24,7 +24,7 @@ class NativeFrameView : public views::NativeFrameView {
   const char* GetClassName() const override;
 
  private:
-  NativeWindowViews* window_;  // weak ref.
+  NativeWindow* window_;  // weak ref.
 
   DISALLOW_COPY_AND_ASSIGN(NativeFrameView);
 };
diff --git a/atom/browser/ui/views/win_frame_view.cc b/atom/browser/ui/views/win_frame_view.cc
index d0338af19d9..7106d8f759c 100644
--- a/atom/browser/ui/views/win_frame_view.cc
+++ b/atom/browser/ui/views/win_frame_view.cc
@@ -41,13 +41,13 @@ int WinFrameView::NonClientHitTest(const gfx::Point& point) {
 
 gfx::Size WinFrameView::GetMinimumSize() const {
   gfx::Size size = window_->WindowSizeToFramelessSize(
-      window_->GetMinimumSize());
+      FramelessView::GetMinimumSize());
   return gfx::win::DIPToScreenSize(size);
 }
 
 gfx::Size WinFrameView::GetMaximumSize() const {
   gfx::Size size = window_->WindowSizeToFramelessSize(
-      window_->GetMaximumSize());
+      FramelessView::GetMaximumSize());
   return gfx::win::DIPToScreenSize(size);
 }
 

From 279407f7a300e0914b5fdc6b0b6cb0fb3b23a2f8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 19:32:23 +0800
Subject: [PATCH 04/30] osx: Fix converting size for frameless window

---
 atom/browser/native_window_mac.mm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 76f9b0d0de0..70c3cfc0cc7 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -789,12 +789,18 @@ void NativeWindowMac::HandleKeyboardEvent(
 }
 
 gfx::Size NativeWindowMac::ContentSizeToWindowSize(const gfx::Size& size) {
+  if (!has_frame())
+    return size;
+
   NSRect content = NSMakeRect(0, 0, size.width(), size.height());
   NSRect frame = [window_ frameRectForContentRect:content];
   return gfx::Size(frame.size);
 }
 
 gfx::Size NativeWindowMac::WindowSizeToContentSize(const gfx::Size& size) {
+  if (!has_frame())
+    return size;
+
   NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
   NSRect content = [window_ contentRectForFrameRect:frame];
   return gfx::Size(content.size);

From a9b0111c3e312d5797d1d4e5e64447f50e856467 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 20:03:43 +0800
Subject: [PATCH 05/30] views: Use the quicker way of return content size

Converting content size to window size on high DPI systems will lose
percise and have 1px offset sometimes.
---
 atom/browser/native_window_views.cc | 4 ++++
 atom/browser/native_window_views.h  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index fdcbe42205b..0264ac59e1a 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -442,6 +442,10 @@ gfx::Rect NativeWindowViews::GetBounds() {
   return window_->GetWindowBoundsInScreen();
 }
 
+gfx::Size NativeWindowViews::GetContentSize() {
+  return web_view_->size();
+}
+
 void NativeWindowViews::SetResizable(bool resizable) {
 #if defined(OS_WIN)
   // WS_MAXIMIZEBOX => Maximize button
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 0e74410868e..1ba02e89a3a 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -63,6 +63,7 @@ class NativeWindowViews : public NativeWindow,
   bool IsFullscreen() const override;
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Rect GetBounds() override;
+  gfx::Size GetContentSize() override;
   void SetResizable(bool resizable) override;
   bool IsResizable() override;
   void SetAlwaysOnTop(bool top) override;

From d19ead1907acbbf60b069f25709562d66cf6aad8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 20:09:29 +0800
Subject: [PATCH 06/30] osx: Call setContentMinSize in
 SetContentSizeConstraints

---
 atom/browser/native_window_mac.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 70c3cfc0cc7..bb00a82451c 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -559,11 +559,11 @@ void NativeWindowMac::SetContentSizeConstraints(
   NSView* content = [window_ contentView];
   if (size_constraints.HasMinimumSize()) {
     NSSize min_size = ToNSSize(size_constraints.GetMinimumSize());
-    [window_ setMinSize:[content convertSize:min_size toView:nil]];
+    [window_ setContentMinSize:[content convertSize:min_size toView:nil]];
   }
   if (size_constraints.HasMaximumSize()) {
     NSSize max_size = ToNSSize(size_constraints.GetMaximumSize());
-    [window_ setMaxSize:[content convertSize:max_size toView:nil]];
+    [window_ setContentMaxSize:[content convertSize:max_size toView:nil]];
   }
   NativeWindow::SetContentSizeConstraints(size_constraints);
 }

From e675407552c808a43dea74ad8796cd0fa9d8c05e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 20:36:28 +0800
Subject: [PATCH 07/30] Make min/max size respect use-content-size

---
 atom/browser/native_window.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index cad6942d2e9..f8023222fb7 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -119,15 +119,23 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   } else if (options.Get(switches::kCenter, &center) && center) {
     Center();
   }
+  extensions::SizeConstraints size_constraints;
   int min_height = 0, min_width = 0;
   if (options.Get(switches::kMinHeight, &min_height) |
       options.Get(switches::kMinWidth, &min_width)) {
-    SetMinimumSize(gfx::Size(min_width, min_height));
+    size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
   }
   int max_height = INT_MAX, max_width = INT_MAX;
   if (options.Get(switches::kMaxHeight, &max_height) |
       options.Get(switches::kMaxWidth, &max_width)) {
-    SetMaximumSize(gfx::Size(max_width, max_height));
+    size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
+  }
+  bool use_content_size = false;
+  options.Get(switches::kUseContentSize, &use_content_size);
+  if (use_content_size) {
+    SetContentSizeConstraints(size_constraints);
+  } else {
+    SetSizeConstraints(size_constraints);
   }
   bool resizable;
   if (options.Get(switches::kResizable, &resizable)) {

From 3b1ee994e21f5afc361c830913bce175a37a6217 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 20:37:08 +0800
Subject: [PATCH 08/30] views: Remove hack on setting min/max size for
 frameless window

---
 atom/browser/native_window_views.cc     | 27 -------------------------
 atom/browser/native_window_views.h      |  2 --
 atom/browser/ui/views/frameless_view.cc |  4 ++--
 atom/browser/ui/views/win_frame_view.cc | 13 ------------
 atom/browser/ui/views/win_frame_view.h  |  2 --
 5 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 0264ac59e1a..5cd99dbdefb 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -854,33 +854,6 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
 }
 #endif
 
-gfx::Size NativeWindowViews::WindowSizeToFramelessSize(
-    const gfx::Size& size) {
-  if (size.width() == 0 && size.height() == 0)
-    return size;
-
-  gfx::Rect window_bounds = gfx::Rect(size);
-  if (use_content_size_) {
-    if (menu_bar_ && menu_bar_visible_) {
-      window_bounds.set_height(window_bounds.height() + kMenuBarHeight);
-    }
-  } else if (has_frame()) {
-#if defined(OS_WIN)
-  gfx::Size frame_size = gfx::win::ScreenToDIPRect(
-      window_->non_client_view()->GetWindowBoundsForClientBounds(
-          gfx::Rect())).size();
-#else
-  gfx::Size frame_size =
-      window_->non_client_view()->GetWindowBoundsForClientBounds(
-          gfx::Rect()).size();
-#endif
-    window_bounds.set_height(window_bounds.height() - frame_size.height());
-    window_bounds.set_width(window_bounds.width() - frame_size.width());
-  }
-
-  return window_bounds.size();
-}
-
 gfx::Size NativeWindowViews::ContentSizeToWindowSize(const gfx::Size& size) {
   if (!has_frame())
     return size;
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 1ba02e89a3a..35ca7b63e25 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -89,8 +89,6 @@ class NativeWindowViews : public NativeWindow,
 
   gfx::AcceleratedWidget GetAcceleratedWidget();
 
-  gfx::Size WindowSizeToFramelessSize(const gfx::Size& size);
-
   views::Widget* widget() const { return window_.get(); }
 
 #if defined(OS_WIN)
diff --git a/atom/browser/ui/views/frameless_view.cc b/atom/browser/ui/views/frameless_view.cc
index f5e28025e9b..2ec4459f6b4 100644
--- a/atom/browser/ui/views/frameless_view.cc
+++ b/atom/browser/ui/views/frameless_view.cc
@@ -104,11 +104,11 @@ gfx::Size FramelessView::GetPreferredSize() const {
 }
 
 gfx::Size FramelessView::GetMinimumSize() const {
-  return static_cast<NativeWindow*>(window_)->GetMinimumSize();
+  return window_->GetContentSizeConstraints().GetMinimumSize();
 }
 
 gfx::Size FramelessView::GetMaximumSize() const {
-  return static_cast<NativeWindow*>(window_)->GetMaximumSize();
+  return window_->GetContentSizeConstraints().GetMaximumSize();
 }
 
 const char* FramelessView::GetClassName() const {
diff --git a/atom/browser/ui/views/win_frame_view.cc b/atom/browser/ui/views/win_frame_view.cc
index 7106d8f759c..fca7cb23347 100644
--- a/atom/browser/ui/views/win_frame_view.cc
+++ b/atom/browser/ui/views/win_frame_view.cc
@@ -5,7 +5,6 @@
 #include "atom/browser/ui/views/win_frame_view.h"
 
 #include "atom/browser/native_window_views.h"
-#include "ui/gfx/win/dpi.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/win/hwnd_util.h"
 
@@ -39,18 +38,6 @@ int WinFrameView::NonClientHitTest(const gfx::Point& point) {
     return FramelessView::NonClientHitTest(point);
 }
 
-gfx::Size WinFrameView::GetMinimumSize() const {
-  gfx::Size size = window_->WindowSizeToFramelessSize(
-      FramelessView::GetMinimumSize());
-  return gfx::win::DIPToScreenSize(size);
-}
-
-gfx::Size WinFrameView::GetMaximumSize() const {
-  gfx::Size size = window_->WindowSizeToFramelessSize(
-      FramelessView::GetMaximumSize());
-  return gfx::win::DIPToScreenSize(size);
-}
-
 const char* WinFrameView::GetClassName() const {
   return kViewClassName;
 }
diff --git a/atom/browser/ui/views/win_frame_view.h b/atom/browser/ui/views/win_frame_view.h
index 825677bff31..b2c1ef3a15d 100644
--- a/atom/browser/ui/views/win_frame_view.h
+++ b/atom/browser/ui/views/win_frame_view.h
@@ -20,8 +20,6 @@ class WinFrameView : public FramelessView {
   int NonClientHitTest(const gfx::Point& point) override;
 
   // views::View:
-  gfx::Size GetMinimumSize() const override;
-  gfx::Size GetMaximumSize() const override;
   const char* GetClassName() const override;
 
  private:

From 857acd25741969d390dec96a23ad65a01fdd93a1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 21:06:57 +0800
Subject: [PATCH 09/30] win: Fix GetContentSize for minimized window

---
 atom/browser/native_window_views.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 5cd99dbdefb..d7d6cf8adda 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -443,6 +443,11 @@ gfx::Rect NativeWindowViews::GetBounds() {
 }
 
 gfx::Size NativeWindowViews::GetContentSize() {
+#if defined(OS_WIN)
+  if (IsMinimized())
+    return NativeWindow::GetContentSize();
+#endif
+
   return web_view_->size();
 }
 

From 239b97cde16896e127d1f814549e26ee474a4abf Mon Sep 17 00:00:00 2001
From: Eran Tiktin <eran.t@mce-sys.com>
Date: Mon, 5 Oct 2015 16:51:49 +0300
Subject: [PATCH 10/30] Update process.md

Fixed the `loaded` example according to
[this](https://github.com/atom/electron/issues/2984#issuecomment-145465907)
comment.
---
 docs/api/process.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/api/process.md b/docs/api/process.md
index 4e0fa4d602e..a2157886bc6 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -21,9 +21,11 @@ the global scope when node integration is turned off:
 
 ```js
 // preload.js
+var _setImmediate = setImmediate;
+var _clearImmediate = clearImmediate;
 process.once('loaded', function() {
-  global.setImmediate = setImmediate;
-  global.clearImmediate = clearImmediate;
+  global.setImmediate = _setImmediate;
+  global.clearImmediate = _clearImmediate;
 });
 ```
 

From ea3e84e7ff38393449c70e447019342766836e2d Mon Sep 17 00:00:00 2001
From: Eran Tiktin <eran.t@mce-sys.com>
Date: Mon, 5 Oct 2015 16:56:36 +0300
Subject: [PATCH 11/30] Update screen.md

Removed a trailing comma.
---
 docs/api/screen.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/screen.md b/docs/api/screen.md
index 3b6c276daf3..42468da1600 100644
--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -47,7 +47,7 @@ app.on('ready', function() {
   if (externalDisplay) {
     mainWindow = new BrowserWindow({
       x: externalDisplay.bounds.x + 50,
-      y: externalDisplay.bounds.y + 50,
+      y: externalDisplay.bounds.y + 50
     });
   }
 });

From 87e0c812e9de44c96b33a65432decbd012c2d17a Mon Sep 17 00:00:00 2001
From: Eran Tiktin <eran.t@mce-sys.com>
Date: Mon, 5 Oct 2015 17:48:48 +0300
Subject: [PATCH 12/30] Update native modules doc

---
 docs/tutorial/using-native-node-modules.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/tutorial/using-native-node-modules.md b/docs/tutorial/using-native-node-modules.md
index 0e6477fc4c0..491415b900a 100644
--- a/docs/tutorial/using-native-node-modules.md
+++ b/docs/tutorial/using-native-node-modules.md
@@ -6,16 +6,17 @@ the location of Electron's headers when building native modules.
 
 ## Native Node Module Compatibility
 
-Since Node v0.11.x there were vital changes in the V8 API. So generally all
-native modules written for Node v0.10.x won't work for newer Node or io.js
-versions. And because Electron internally uses __io.js v3.1.0__, it has the
-same problem.
+Native modules might break when Node starts using a new version of V8.
+To make sure the module you're interested in will work with Electron, you should
+check if it supports the internal Node version used by Electron.
+You can check what version of Node is used in Electron by looking it up in
+the [releases](https://github.com/atom/electron/releases) page or by using
+`process.version` (see [Quick Start](https://github.com/atom/electron/blob/master/docs/tutorial/quick-start.md)
+for example).
 
-To solve this, you should use modules that support Node v0.11.x or later,
-[many modules](https://www.npmjs.org/browse/depended/nan) do support both now.
-For old modules that only support Node v0.10.x, you should use the
-[nan](https://github.com/rvagg/nan) module to port it to v0.11.x or later
-versions of Node or io.js.
+Consider using [NAN](https://github.com/nodejs/nan/) for your own modules, since
+it makes it easier to support multiple versions of Node. It's also helpful for
+porting old modules to newer versions of Node so they can work with Electron.
 
 ## How to Install Native Modules
 

From bb4951514582b366a91b4367158e710f5cc1eee0 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 00:13:57 +0800
Subject: [PATCH 13/30] Separate Windows specific code of NativeWindow to
 another file

---
 atom/browser/native_window_views.cc     | 136 ----------------------
 atom/browser/native_window_views_win.cc | 145 ++++++++++++++++++++++++
 filenames.gypi                          |   1 +
 3 files changed, 146 insertions(+), 136 deletions(-)
 create mode 100644 atom/browser/native_window_views_win.cc

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index d7d6cf8adda..308e8ee3dcc 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -77,70 +77,6 @@ bool IsAltModifier(const content::NativeWebKeyboardEvent& event) {
          (modifiers == (Modifiers::AltKey | Modifiers::IsRight));
 }
 
-#if defined(OS_WIN)
-// Convert Win32 WM_APPCOMMANDS to strings.
-const char* AppCommandToString(int command_id) {
-  switch (command_id) {
-    case APPCOMMAND_BROWSER_BACKWARD       : return "browser-backward";
-    case APPCOMMAND_BROWSER_FORWARD        : return "browser-forward";
-    case APPCOMMAND_BROWSER_REFRESH        : return "browser-refresh";
-    case APPCOMMAND_BROWSER_STOP           : return "browser-stop";
-    case APPCOMMAND_BROWSER_SEARCH         : return "browser-search";
-    case APPCOMMAND_BROWSER_FAVORITES      : return "browser-favorites";
-    case APPCOMMAND_BROWSER_HOME           : return "browser-home";
-    case APPCOMMAND_VOLUME_MUTE            : return "volume-mute";
-    case APPCOMMAND_VOLUME_DOWN            : return "volume-down";
-    case APPCOMMAND_VOLUME_UP              : return "volume-up";
-    case APPCOMMAND_MEDIA_NEXTTRACK        : return "media-nexttrack";
-    case APPCOMMAND_MEDIA_PREVIOUSTRACK    : return "media-previoustrack";
-    case APPCOMMAND_MEDIA_STOP             : return "media-stop";
-    case APPCOMMAND_MEDIA_PLAY_PAUSE       : return "media-play_pause";
-    case APPCOMMAND_LAUNCH_MAIL            : return "launch-mail";
-    case APPCOMMAND_LAUNCH_MEDIA_SELECT    : return "launch-media-select";
-    case APPCOMMAND_LAUNCH_APP1            : return "launch-app1";
-    case APPCOMMAND_LAUNCH_APP2            : return "launch-app2";
-    case APPCOMMAND_BASS_DOWN              : return "bass-down";
-    case APPCOMMAND_BASS_BOOST             : return "bass-boost";
-    case APPCOMMAND_BASS_UP                : return "bass-up";
-    case APPCOMMAND_TREBLE_DOWN            : return "treble-down";
-    case APPCOMMAND_TREBLE_UP              : return "treble-up";
-    case APPCOMMAND_MICROPHONE_VOLUME_MUTE : return "microphone-volume-mute";
-    case APPCOMMAND_MICROPHONE_VOLUME_DOWN : return "microphone-volume-down";
-    case APPCOMMAND_MICROPHONE_VOLUME_UP   : return "microphone-volume-up";
-    case APPCOMMAND_HELP                   : return "help";
-    case APPCOMMAND_FIND                   : return "find";
-    case APPCOMMAND_NEW                    : return "new";
-    case APPCOMMAND_OPEN                   : return "open";
-    case APPCOMMAND_CLOSE                  : return "close";
-    case APPCOMMAND_SAVE                   : return "save";
-    case APPCOMMAND_PRINT                  : return "print";
-    case APPCOMMAND_UNDO                   : return "undo";
-    case APPCOMMAND_REDO                   : return "redo";
-    case APPCOMMAND_COPY                   : return "copy";
-    case APPCOMMAND_CUT                    : return "cut";
-    case APPCOMMAND_PASTE                  : return "paste";
-    case APPCOMMAND_REPLY_TO_MAIL          : return "reply-to-mail";
-    case APPCOMMAND_FORWARD_MAIL           : return "forward-mail";
-    case APPCOMMAND_SEND_MAIL              : return "send-mail";
-    case APPCOMMAND_SPELL_CHECK            : return "spell-check";
-    case APPCOMMAND_MIC_ON_OFF_TOGGLE      : return "mic-on-off-toggle";
-    case APPCOMMAND_CORRECTION_LIST        : return "correction-list";
-    case APPCOMMAND_MEDIA_PLAY             : return "media-play";
-    case APPCOMMAND_MEDIA_PAUSE            : return "media-pause";
-    case APPCOMMAND_MEDIA_RECORD           : return "media-record";
-    case APPCOMMAND_MEDIA_FAST_FORWARD     : return "media-fast-forward";
-    case APPCOMMAND_MEDIA_REWIND           : return "media-rewind";
-    case APPCOMMAND_MEDIA_CHANNEL_UP       : return "media-channel-up";
-    case APPCOMMAND_MEDIA_CHANNEL_DOWN     : return "media-channel-down";
-    case APPCOMMAND_DELETE                 : return "delete";
-    case APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE:
-      return "dictate-or-command-control-toggle";
-    default:
-      return "unknown";
-  }
-}
-#endif
-
 class NativeWindowClientView : public views::ClientView {
  public:
   NativeWindowClientView(views::Widget* widget,
@@ -787,78 +723,6 @@ void NativeWindowViews::OnWidgetMove() {
   NotifyWindowMove();
 }
 
-#if defined(OS_WIN)
-bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
-  std::string command = AppCommandToString(command_id);
-  NotifyWindowExecuteWindowsCommand(command);
-  return false;
-}
-
-bool NativeWindowViews::PreHandleMSG(
-    UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) {
-  switch (message) {
-    case WM_COMMAND:
-      // Handle thumbar button click message.
-      if (HIWORD(w_param) == THBN_CLICKED)
-        return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
-      return false;
-    case WM_SIZE:
-      // Handle window state change.
-      HandleSizeEvent(w_param, l_param);
-      return false;
-    default:
-      return false;
-  }
-}
-
-void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
-  // Here we handle the WM_SIZE event in order to figure out what is the current
-  // window state and notify the user accordingly.
-  switch (w_param) {
-    case SIZE_MAXIMIZED:
-      last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
-      NotifyWindowMaximize();
-      break;
-    case SIZE_MINIMIZED:
-      last_window_state_ = ui::SHOW_STATE_MINIMIZED;
-      NotifyWindowMinimize();
-      break;
-    case SIZE_RESTORED:
-      if (last_window_state_ == ui::SHOW_STATE_NORMAL) {
-        // Window was resized so we save it's new size.
-        last_normal_size_ = GetSize();
-      } else {
-        switch (last_window_state_) {
-          case ui::SHOW_STATE_MAXIMIZED:
-            last_window_state_ = ui::SHOW_STATE_NORMAL;
-
-            // When the window is restored we resize it to the previous known
-            // normal size.
-            NativeWindow::SetSize(last_normal_size_);
-
-            NotifyWindowUnmaximize();
-            break;
-          case ui::SHOW_STATE_MINIMIZED:
-            if (IsFullscreen()) {
-              last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
-              NotifyWindowEnterFullScreen();
-            } else {
-              last_window_state_ = ui::SHOW_STATE_NORMAL;
-
-              // When the window is restored we resize it to the previous known
-              // normal size.
-              NativeWindow::SetSize(last_normal_size_);
-
-              NotifyWindowRestore();
-            }
-            break;
-        }
-      }
-      break;
-  }
-}
-#endif
-
 gfx::Size NativeWindowViews::ContentSizeToWindowSize(const gfx::Size& size) {
   if (!has_frame())
     return size;
diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
new file mode 100644
index 00000000000..79c51289437
--- /dev/null
+++ b/atom/browser/native_window_views_win.cc
@@ -0,0 +1,145 @@
+// 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/browser/native_window_views.h"
+
+namespace atom {
+
+namespace {
+
+// Convert Win32 WM_APPCOMMANDS to strings.
+const char* AppCommandToString(int command_id) {
+  switch (command_id) {
+    case APPCOMMAND_BROWSER_BACKWARD       : return "browser-backward";
+    case APPCOMMAND_BROWSER_FORWARD        : return "browser-forward";
+    case APPCOMMAND_BROWSER_REFRESH        : return "browser-refresh";
+    case APPCOMMAND_BROWSER_STOP           : return "browser-stop";
+    case APPCOMMAND_BROWSER_SEARCH         : return "browser-search";
+    case APPCOMMAND_BROWSER_FAVORITES      : return "browser-favorites";
+    case APPCOMMAND_BROWSER_HOME           : return "browser-home";
+    case APPCOMMAND_VOLUME_MUTE            : return "volume-mute";
+    case APPCOMMAND_VOLUME_DOWN            : return "volume-down";
+    case APPCOMMAND_VOLUME_UP              : return "volume-up";
+    case APPCOMMAND_MEDIA_NEXTTRACK        : return "media-nexttrack";
+    case APPCOMMAND_MEDIA_PREVIOUSTRACK    : return "media-previoustrack";
+    case APPCOMMAND_MEDIA_STOP             : return "media-stop";
+    case APPCOMMAND_MEDIA_PLAY_PAUSE       : return "media-play_pause";
+    case APPCOMMAND_LAUNCH_MAIL            : return "launch-mail";
+    case APPCOMMAND_LAUNCH_MEDIA_SELECT    : return "launch-media-select";
+    case APPCOMMAND_LAUNCH_APP1            : return "launch-app1";
+    case APPCOMMAND_LAUNCH_APP2            : return "launch-app2";
+    case APPCOMMAND_BASS_DOWN              : return "bass-down";
+    case APPCOMMAND_BASS_BOOST             : return "bass-boost";
+    case APPCOMMAND_BASS_UP                : return "bass-up";
+    case APPCOMMAND_TREBLE_DOWN            : return "treble-down";
+    case APPCOMMAND_TREBLE_UP              : return "treble-up";
+    case APPCOMMAND_MICROPHONE_VOLUME_MUTE : return "microphone-volume-mute";
+    case APPCOMMAND_MICROPHONE_VOLUME_DOWN : return "microphone-volume-down";
+    case APPCOMMAND_MICROPHONE_VOLUME_UP   : return "microphone-volume-up";
+    case APPCOMMAND_HELP                   : return "help";
+    case APPCOMMAND_FIND                   : return "find";
+    case APPCOMMAND_NEW                    : return "new";
+    case APPCOMMAND_OPEN                   : return "open";
+    case APPCOMMAND_CLOSE                  : return "close";
+    case APPCOMMAND_SAVE                   : return "save";
+    case APPCOMMAND_PRINT                  : return "print";
+    case APPCOMMAND_UNDO                   : return "undo";
+    case APPCOMMAND_REDO                   : return "redo";
+    case APPCOMMAND_COPY                   : return "copy";
+    case APPCOMMAND_CUT                    : return "cut";
+    case APPCOMMAND_PASTE                  : return "paste";
+    case APPCOMMAND_REPLY_TO_MAIL          : return "reply-to-mail";
+    case APPCOMMAND_FORWARD_MAIL           : return "forward-mail";
+    case APPCOMMAND_SEND_MAIL              : return "send-mail";
+    case APPCOMMAND_SPELL_CHECK            : return "spell-check";
+    case APPCOMMAND_MIC_ON_OFF_TOGGLE      : return "mic-on-off-toggle";
+    case APPCOMMAND_CORRECTION_LIST        : return "correction-list";
+    case APPCOMMAND_MEDIA_PLAY             : return "media-play";
+    case APPCOMMAND_MEDIA_PAUSE            : return "media-pause";
+    case APPCOMMAND_MEDIA_RECORD           : return "media-record";
+    case APPCOMMAND_MEDIA_FAST_FORWARD     : return "media-fast-forward";
+    case APPCOMMAND_MEDIA_REWIND           : return "media-rewind";
+    case APPCOMMAND_MEDIA_CHANNEL_UP       : return "media-channel-up";
+    case APPCOMMAND_MEDIA_CHANNEL_DOWN     : return "media-channel-down";
+    case APPCOMMAND_DELETE                 : return "delete";
+    case APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE:
+      return "dictate-or-command-control-toggle";
+    default:
+      return "unknown";
+  }
+}
+
+}  // namespace
+
+bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
+  std::string command = AppCommandToString(command_id);
+  NotifyWindowExecuteWindowsCommand(command);
+  return false;
+}
+
+bool NativeWindowViews::PreHandleMSG(
+    UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) {
+  switch (message) {
+    case WM_COMMAND:
+      // Handle thumbar button click message.
+      if (HIWORD(w_param) == THBN_CLICKED)
+        return taskbar_host_.HandleThumbarButtonEvent(LOWORD(w_param));
+      return false;
+    case WM_SIZE:
+      // Handle window state change.
+      HandleSizeEvent(w_param, l_param);
+      return false;
+    default:
+      return false;
+  }
+}
+
+void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
+  // Here we handle the WM_SIZE event in order to figure out what is the current
+  // window state and notify the user accordingly.
+  switch (w_param) {
+    case SIZE_MAXIMIZED:
+      last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
+      NotifyWindowMaximize();
+      break;
+    case SIZE_MINIMIZED:
+      last_window_state_ = ui::SHOW_STATE_MINIMIZED;
+      NotifyWindowMinimize();
+      break;
+    case SIZE_RESTORED:
+      if (last_window_state_ == ui::SHOW_STATE_NORMAL) {
+        // Window was resized so we save it's new size.
+        last_normal_size_ = GetSize();
+      } else {
+        switch (last_window_state_) {
+          case ui::SHOW_STATE_MAXIMIZED:
+            last_window_state_ = ui::SHOW_STATE_NORMAL;
+
+            // When the window is restored we resize it to the previous known
+            // normal size.
+            SetSize(last_normal_size_);
+
+            NotifyWindowUnmaximize();
+            break;
+          case ui::SHOW_STATE_MINIMIZED:
+            if (IsFullscreen()) {
+              last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
+              NotifyWindowEnterFullScreen();
+            } else {
+              last_window_state_ = ui::SHOW_STATE_NORMAL;
+
+              // When the window is restored we resize it to the previous known
+              // normal size.
+              SetSize(last_normal_size_);
+
+              NotifyWindowRestore();
+            }
+            break;
+        }
+      }
+      break;
+  }
+}
+
+}  // namespace atom
diff --git a/filenames.gypi b/filenames.gypi
index a6e799cd67c..6418ba28721 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -154,6 +154,7 @@
       'atom/browser/mac/atom_application_delegate.mm',
       'atom/browser/native_window.cc',
       'atom/browser/native_window.h',
+      'atom/browser/native_window_views_win.cc',
       'atom/browser/native_window_views.cc',
       'atom/browser/native_window_views.h',
       'atom/browser/native_window_mac.h',

From 60fb406c614af764b21df19ff1cc654ee2c1edda Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 00:15:10 +0800
Subject: [PATCH 14/30] views: Fix content size constraints in window with
 menubar

---
 atom/browser/native_window_views.cc | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 308e8ee3dcc..0e04414b6a4 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -519,8 +519,24 @@ void NativeWindowViews::SetMenu(ui::MenuModel* menu_model) {
 
     if (!menu_bar_autohide_) {
       SetMenuBarVisibility(true);
-      if (use_content_size_)
+      if (use_content_size_) {
+        // Enlarge the size constraints for the menu.
+        extensions::SizeConstraints constraints = GetContentSizeConstraints();
+        if (constraints.HasMinimumSize()) {
+          gfx::Size min_size = constraints.GetMinimumSize();
+          min_size.set_height(min_size.height() + kMenuBarHeight);
+          constraints.set_minimum_size(min_size);
+        }
+        if (constraints.HasMaximumSize()) {
+          gfx::Size max_size = constraints.GetMaximumSize();
+          max_size.set_height(max_size.height() + kMenuBarHeight);
+          constraints.set_maximum_size(max_size);
+        }
+        SetContentSizeConstraints(constraints);
+
+        // Resize the window to make sure content size is not changed.
         SetContentSize(content_size);
+      }
     }
   }
 

From c8723238f8fc6abb68ad42a3f9411760e1fcd048 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 00:21:37 +0800
Subject: [PATCH 15/30] win: Fix building on Windows

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

diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
index 79c51289437..6092a2242ac 100644
--- a/atom/browser/native_window_views_win.cc
+++ b/atom/browser/native_window_views_win.cc
@@ -118,7 +118,7 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
 
             // When the window is restored we resize it to the previous known
             // normal size.
-            SetSize(last_normal_size_);
+            NativeWindow::SetSize(last_normal_size_);
 
             NotifyWindowUnmaximize();
             break;
@@ -131,7 +131,7 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
 
               // When the window is restored we resize it to the previous known
               // normal size.
-              SetSize(last_normal_size_);
+              NativeWindow::SetSize(last_normal_size_);
 
               NotifyWindowRestore();
             }

From b70e7c6a4cc51548769075f3f9925430e2435746 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 00:39:16 +0800
Subject: [PATCH 16/30] Remove default definition of ContentSizeToWindowSize

---
 atom/browser/native_window.cc | 8 --------
 atom/browser/native_window.h  | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index f8023222fb7..641bdd3757a 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -170,14 +170,6 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
     Show();
 }
 
-gfx::Size NativeWindow::ContentSizeToWindowSize(const gfx::Size& size) {
-  return size;
-}
-
-gfx::Size NativeWindow::WindowSizeToContentSize(const gfx::Size& size) {
-  return size;
-}
-
 void NativeWindow::SetSize(const gfx::Size& size) {
   SetBounds(gfx::Rect(GetPosition(), size));
 }
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index 53878330646..379c23837b1 100644
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -242,8 +242,8 @@ class NativeWindow : public base::SupportsUserData,
                const mate::Dictionary& options);
 
   // Converts between content size to window size.
-  virtual gfx::Size ContentSizeToWindowSize(const gfx::Size& size);
-  virtual gfx::Size WindowSizeToContentSize(const gfx::Size& size);
+  virtual gfx::Size ContentSizeToWindowSize(const gfx::Size& size) = 0;
+  virtual gfx::Size WindowSizeToContentSize(const gfx::Size& size) = 0;
 
   // content::WebContentsObserver:
   void RenderViewCreated(content::RenderViewHost* render_view_host) override;

From ccf4ed907a2ad95bcbb35925ec9ddf59195605a6 Mon Sep 17 00:00:00 2001
From: Heilig Benedek <benecene@gmail.com>
Date: Mon, 5 Oct 2015 19:11:20 +0200
Subject: [PATCH 17/30] Fix some minor bugs related to KeyboardEvent sending

---
 atom/common/keyboad_util.cc                           | 7 ++++---
 atom/common/native_mate_converters/blink_converter.cc | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/atom/common/keyboad_util.cc b/atom/common/keyboad_util.cc
index 1baa829ff74..29d1a800c85 100644
--- a/atom/common/keyboad_util.cc
+++ b/atom/common/keyboad_util.cc
@@ -10,9 +10,10 @@ namespace atom {
 ui::KeyboardCode KeyboardCodeFromCharCode(char c, bool* shifted) {
   *shifted = false;
   switch (c) {
-    case 8: case 0x7F: return ui::VKEY_BACK;
-    case 9: return ui::VKEY_TAB;
-    case 0xD: case 3: return ui::VKEY_RETURN;
+    case 0x08: return ui::VKEY_BACK;
+    case 0x7F: return ui::VKEY_DELETE;
+    case 0x09: return ui::VKEY_TAB;
+    case 0x0D: return ui::VKEY_RETURN;
     case 0x1B: return ui::VKEY_ESCAPE;
     case ' ': return ui::VKEY_SPACE;
 
diff --git a/atom/common/native_mate_converters/blink_converter.cc b/atom/common/native_mate_converters/blink_converter.cc
index 0a599bfdf01..fcfc8905b3e 100644
--- a/atom/common/native_mate_converters/blink_converter.cc
+++ b/atom/common/native_mate_converters/blink_converter.cc
@@ -61,7 +61,7 @@ struct Converter<blink::WebInputEvent::Type> {
     else if (type == "mousewheel")
       *out = blink::WebInputEvent::MouseWheel;
     else if (type == "keydown")
-      *out = blink::WebInputEvent::KeyDown;
+      *out = blink::WebInputEvent::RawKeyDown;
     else if (type == "keyup")
       *out = blink::WebInputEvent::KeyUp;
     else if (type == "char")

From c3cd438d34a265074c2896a688811d5f71f6d60a Mon Sep 17 00:00:00 2001
From: Eran Tiktin <eran.t@mce-sys.com>
Date: Mon, 5 Oct 2015 21:12:29 +0300
Subject: [PATCH 18/30] Replace io.js references with node.js references

---
 README.md                    | 2 +-
 docs/api/native-image.md     | 2 +-
 docs/tutorial/quick-start.md | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fa122c9b6c6..94d4c09982b 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 :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 [io.js](http://iojs.org) and
+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).
 
diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index df2bb96ff9d..097a8130c24 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -142,7 +142,7 @@ Returns a boolean whether the image is empty.
 
 Returns the size of the image.
 
-[buffer]: https://iojs.org/api/buffer.html#buffer_class_buffer
+[buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer
 
 ### `image.setTemplateImage(option)`
 
diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index 94368df09c1..5300d754a69 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -2,7 +2,7 @@
 
 Electron enables you to create desktop applications with pure JavaScript by
 providing a runtime with rich native (operating system) APIs. You could see it
-as a variant of the io.js runtime that is focused on desktop applications
+as a variant of the Node.js runtime that is focused on desktop applications
 instead of web servers.
 
 This doesn't mean Electron is a JavaScript binding to graphical user interface
@@ -22,8 +22,9 @@ multi-process architecture is also used. Each web page in Electron runs in
 its own process, which is called __the renderer process__.
 
 In normal browsers, web pages usually run in a sandboxed environment and are not
-allowed access to native resources. Electron users, however, have the power to use
-io.js APIs in web pages allowing lower level operating system interactions.
+allowed access to native resources. Electron users, however, have the power to
+use Node.js APIs in web pages allowing lower level operating system
+interactions.
 
 ### Differences Between Main Process and Renderer Process
 
@@ -129,7 +130,7 @@ Finally the `index.html` is the web page you want to show:
   </head>
   <body>
     <h1>Hello World!</h1>
-    We are using io.js <script>document.write(process.version)</script>
+    We are using Node.js <script>document.write(process.version)</script>
     and Electron <script>document.write(process.versions['electron'])</script>.
   </body>
 </html>

From db46c1b92561a7145ff1920de1b49c085cc2d380 Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 6 Oct 2015 13:48:39 +0900
Subject: [PATCH 19/30] Update as upstream

---
 docs-translations/ko-KR/api/process.md | 16 ++++++++++++++++
 docs-translations/ko-KR/api/screen.md  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs-translations/ko-KR/api/process.md b/docs-translations/ko-KR/api/process.md
index f557f8cc6be..57ba0fa768a 100644
--- a/docs-translations/ko-KR/api/process.md
+++ b/docs-translations/ko-KR/api/process.md
@@ -7,6 +7,22 @@ Electron의 `process` 객체는 기존의 node와는 달리 약간의 차이점
 * `process.versions['chrome']` String - Chromium의 버전.
 * `process.resourcesPath` String - JavaScript 소스코드의 경로.
 
+## Events
+
+### Event: 'loaded'
+
+Electron 내부 초기화 스크립트의 로드가 완료되고, 웹 페이지나 메인 스크립트를 로드하기 시작할 때 발생하는 이벤트입니다.
+
+이 이벤트는 preload 스크립트를 통해 node 통합이 꺼져있는 전역 스코프에 node의 전역 심볼들을 다시 추가할 때 사용할 수 있습니다: 
+
+```javascript
+// preload.js
+process.once('loaded', function() {
+  global.setImmediate = setImmediate;
+  global.clearImmediate = clearImmediate;
+});
+```
+
 ## Methods
 
 `process` 객체는 다음과 같은 메서드를 가지고 있습니다:
diff --git a/docs-translations/ko-KR/api/screen.md b/docs-translations/ko-KR/api/screen.md
index 2d3c02f8541..de2d8baf4e3 100644
--- a/docs-translations/ko-KR/api/screen.md
+++ b/docs-translations/ko-KR/api/screen.md
@@ -36,7 +36,7 @@ app.on('ready', function() {
   var displays = electronScreen.getAllDisplays();
   var externalDisplay = null;
   for (var 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;
     }

From 428c5b6d01fb0cc7aaa465ca98832d395e16e2b2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 14:50:18 +0800
Subject: [PATCH 20/30] Setting "x" and "y" should not change window size

---
 atom/browser/native_window.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 641bdd3757a..981804cb22c 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -112,10 +112,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   int x = -1, y = -1;
   bool center;
   if (options.Get(switches::kX, &x) && options.Get(switches::kY, &y)) {
-    int width = -1, height = -1;
-    options.Get(switches::kWidth, &width);
-    options.Get(switches::kHeight, &height);
-    SetBounds(gfx::Rect(x, y, width, height));
+    SetPosition(gfx::Point(x, y));
   } else if (options.Get(switches::kCenter, &center) && center) {
     Center();
   }

From 6fea6cf58acbc00a66837628d3a20d5bd1938fa1 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 15:15:23 +0800
Subject: [PATCH 21/30] osx: Fix setting size constraints for frameless window

---
 atom/browser/native_window_mac.mm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index bb00a82451c..5f867d9b1a6 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -22,11 +22,6 @@
 
 namespace {
 
-// Converts gfx::Size to NSSize.
-inline NSSize ToNSSize(const gfx::Size& size) {
-  return NSMakeSize(size.width(), size.height());
-}
-
 // Prevents window from resizing during the scope.
 class ScopedDisableResize {
  public:
@@ -556,13 +551,25 @@ gfx::Rect NativeWindowMac::GetBounds() {
 
 void NativeWindowMac::SetContentSizeConstraints(
     const extensions::SizeConstraints& size_constraints) {
+  auto convertSize = [this](const gfx::Size& size) {
+    // Our frameless window still has titlebar attached, so setting contentSize
+    // will result in actual content size being larger.
+    if (!has_frame()) {
+      NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
+      NSRect content = [window_ contentRectForFrameRect:frame];
+      return content.size;
+    } else {
+      return NSMakeSize(size.width(), size.height());
+    }
+  };
+
   NSView* content = [window_ contentView];
   if (size_constraints.HasMinimumSize()) {
-    NSSize min_size = ToNSSize(size_constraints.GetMinimumSize());
+    NSSize min_size = convertSize(size_constraints.GetMinimumSize());
     [window_ setContentMinSize:[content convertSize:min_size toView:nil]];
   }
   if (size_constraints.HasMaximumSize()) {
-    NSSize max_size = ToNSSize(size_constraints.GetMaximumSize());
+    NSSize max_size = convertSize(size_constraints.GetMaximumSize());
     [window_ setContentMaxSize:[content convertSize:max_size toView:nil]];
   }
   NativeWindow::SetContentSizeConstraints(size_constraints);

From 898db4d6bd5838b2461174726d022054f19f123e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 15:23:23 +0800
Subject: [PATCH 22/30] osx: Set resizable flag when creating window

Setting resizable for frameless window before it is shown will change
its size.
---
 atom/browser/native_window.cc     | 2 ++
 atom/browser/native_window_mac.mm | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 981804cb22c..dd4694b3bd6 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -134,10 +134,12 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   } else {
     SetSizeConstraints(size_constraints);
   }
+#if defined(OS_WIN) || defined(USE_X11)
   bool resizable;
   if (options.Get(switches::kResizable, &resizable)) {
     SetResizable(resizable);
   }
+#endif
   bool top;
   if (options.Get(switches::kAlwaysOnTop, &top) && top) {
     SetAlwaysOnTop(true);
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 5f867d9b1a6..6420345da9b 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -350,6 +350,8 @@ NativeWindowMac::NativeWindowMac(
 
   bool useStandardWindow = true;
   options.Get(switches::kStandardWindow, &useStandardWindow);
+  bool resizable = true;
+  options.Get(switches::kResizable, &resizable);
 
   // New title bar styles are available in Yosemite or newer
   std::string titleBarStyle;
@@ -357,10 +359,13 @@ NativeWindowMac::NativeWindowMac(
     options.Get(switches::kTitleBarStyle, &titleBarStyle);
 
   NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask |
-                         NSMiniaturizableWindowMask | NSResizableWindowMask;
+                         NSMiniaturizableWindowMask;
   if (!useStandardWindow || transparent() || !has_frame()) {
     styleMask |= NSTexturedBackgroundWindowMask;
   }
+  if (resizable) {
+    styleMask |= NSResizableWindowMask;
+  }
   if ((titleBarStyle == "hidden") || (titleBarStyle == "hidden-inset")) {
     styleMask |= NSFullSizeContentViewWindowMask;
     styleMask |= NSUnifiedTitleAndToolbarWindowMask;

From 8e4094793890cc060912fffb30849e7f7322cdec Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 15:43:36 +0800
Subject: [PATCH 23/30] spec: Make window.open specs more reliable

---
 spec/chromium-spec.coffee              | 41 ++++++++++++--------------
 spec/fixtures/pages/window-opener.html |  5 +++-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/spec/chromium-spec.coffee b/spec/chromium-spec.coffee
index a782079026a..2c4853a0d63 100644
--- a/spec/chromium-spec.coffee
+++ b/spec/chromium-spec.coffee
@@ -4,10 +4,17 @@ https = require 'https'
 path = require 'path'
 ws = require 'ws'
 remote = require 'remote'
+BrowserWindow = remote.require 'browser-window'
 
 describe 'chromium feature', ->
   fixtures = path.resolve __dirname, 'fixtures'
 
+  listener = null
+  afterEach ->
+    if listener?
+      window.removeEventListener 'message', listener
+    listener = null
+
   xdescribe 'heap snapshot', ->
     it 'does not crash', ->
       process.atomBinding('v8_util').takeHeapSnapshot()
@@ -24,20 +31,17 @@ describe 'chromium feature', ->
         $.get "http://127.0.0.1:#{port}"
 
   describe 'document.hidden', ->
-    BrowserWindow = remote.require 'browser-window'
-    ipc = remote.require 'ipc'
     url = "file://#{fixtures}/pages/document-hidden.html"
     w = null
 
     afterEach ->
       w?.destroy()
-      ipc.removeAllListeners 'hidden'
 
     it 'is set correctly when window is not shown', (done) ->
-      ipc.once 'hidden', (event, hidden) ->
-        assert hidden
-        done()
       w = new BrowserWindow(show:false)
+      w.webContents.on 'ipc-message', (event, args) ->
+        assert.deepEqual args, ['hidden', true]
+        done()
       w.loadUrl url
 
   describe 'navigator.webkitGetUserMedia', ->
@@ -52,8 +56,6 @@ describe 'chromium feature', ->
       assert.notEqual navigator.language, ''
 
   describe 'window.open', ->
-    @timeout 10000
-
     it 'returns a BrowserWindowProxy object', ->
       b = window.open 'about:blank', '', 'show=no'
       assert.equal b.closed, false
@@ -62,46 +64,41 @@ describe 'chromium feature', ->
 
     it 'accepts "node-integration" as feature', (done) ->
       listener = (event) ->
-        window.removeEventListener 'message', listener
-        b.close()
         assert.equal event.data, 'undefined'
+        b.close()
         done()
       window.addEventListener 'message', listener
       b = window.open "file://#{fixtures}/pages/window-opener-node.html", '', 'node-integration=no,show=no'
 
     it 'inherit options of parent window', (done) ->
       listener = (event) ->
-        window.removeEventListener 'message', listener
-        b.close()
         size = remote.getCurrentWindow().getSize()
         assert.equal event.data, "size: #{size.width} #{size.height}"
+        b.close()
         done()
       window.addEventListener 'message', listener
       b = window.open "file://#{fixtures}/pages/window-open-size.html", '', 'show=no'
 
   describe 'window.opener', ->
-    @timeout 10000
-
-    ipc = remote.require 'ipc'
     url = "file://#{fixtures}/pages/window-opener.html"
     w = null
 
     afterEach ->
       w?.destroy()
-      ipc.removeAllListeners 'opener'
 
     it 'is null for main window', (done) ->
-      ipc.once 'opener', (event, opener) ->
-        assert.equal opener, null
-        done()
-      BrowserWindow = remote.require 'browser-window'
       w = new BrowserWindow(show: false)
+      w.webContents.on 'ipc-message', (event, args) ->
+        assert.deepEqual args, ['opener', null]
+        done()
       w.loadUrl url
 
     it 'is not null for window opened by window.open', (done) ->
-      ipc.once 'opener', (event, opener) ->
+      listener = (event) ->
+        assert.equal event.data, 'object'
         b.close()
-        done(if opener isnt null then undefined else opener)
+        done()
+      window.addEventListener 'message', listener
       b = window.open url, '', 'show=no'
 
   describe 'window.opener.postMessage', ->
diff --git a/spec/fixtures/pages/window-opener.html b/spec/fixtures/pages/window-opener.html
index 0b5ecd556c9..226b57dbd70 100644
--- a/spec/fixtures/pages/window-opener.html
+++ b/spec/fixtures/pages/window-opener.html
@@ -1,7 +1,10 @@
 <html>
 <body>
 <script type="text/javascript" charset="utf-8">
-  require('ipc').send('opener', window.opener);
+  if (window.opener !== null)
+    window.opener.postMessage(typeof window.opener, '*');
+  else
+    require('ipc').send('opener', window.opener);
 </script>
 </body>
 </html>

From f6327de7f748fe92de91aa6cc99db9df64c6fe09 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 16:08:32 +0800
Subject: [PATCH 24/30] spec: Increase timeout for window.open specs

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

diff --git a/spec/chromium-spec.coffee b/spec/chromium-spec.coffee
index 2c4853a0d63..a034f937823 100644
--- a/spec/chromium-spec.coffee
+++ b/spec/chromium-spec.coffee
@@ -56,6 +56,8 @@ describe 'chromium feature', ->
       assert.notEqual navigator.language, ''
 
   describe 'window.open', ->
+    @timeout 10000
+
     it 'returns a BrowserWindowProxy object', ->
       b = window.open 'about:blank', '', 'show=no'
       assert.equal b.closed, false
@@ -80,6 +82,8 @@ describe 'chromium feature', ->
       b = window.open "file://#{fixtures}/pages/window-open-size.html", '', 'show=no'
 
   describe 'window.opener', ->
+    @timeout 10000
+
     url = "file://#{fixtures}/pages/window-opener.html"
     w = null
 

From e06778178a1f5369c93530d678e6af059f59995b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 16:06:39 +0800
Subject: [PATCH 25/30] linux: Restore size constraints when became sizable

---
 atom/browser/native_window_views.cc | 19 +++++++++++++++----
 atom/browser/native_window_views.h  |  7 +++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 0e04414b6a4..6d89ee1d06e 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -387,6 +387,15 @@ gfx::Size NativeWindowViews::GetContentSize() {
   return web_view_->size();
 }
 
+void NativeWindowViews::SetContentSizeConstraints(
+    const extensions::SizeConstraints& size_constraints) {
+  NativeWindow::SetContentSizeConstraints(size_constraints);
+#if defined(USE_X11)
+  if (resizable_)
+    old_size_constraints_ = size_constraints;
+#endif
+}
+
 void NativeWindowViews::SetResizable(bool resizable) {
 #if defined(OS_WIN)
   // WS_MAXIMIZEBOX => Maximize button
@@ -403,11 +412,13 @@ void NativeWindowViews::SetResizable(bool resizable) {
     // On Linux there is no "resizable" property of a window, we have to set
     // both the minimum and maximum size to the window size to achieve it.
     if (resizable) {
-      SetMaximumSize(gfx::Size());
-      SetMinimumSize(gfx::Size());
+      SetContentSizeConstraints(old_size_constraints_);
     } else {
-      SetMaximumSize(GetSize());
-      SetMinimumSize(GetSize());
+      old_size_constraints_ = GetContentSizeConstraints();
+      resizable_ = false;
+      gfx::Size content_size = GetContentSize();
+      SetContentSizeConstraints(
+          extensions::SizeConstraints(content_size, content_size));
     }
   }
 #endif
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 35ca7b63e25..0014acd073c 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -64,6 +64,8 @@ class NativeWindowViews : public NativeWindow,
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Rect GetBounds() override;
   gfx::Size GetContentSize() override;
+  void SetContentSizeConstraints(
+      const extensions::SizeConstraints& size_constraints) override;
   void SetResizable(bool resizable) override;
   bool IsResizable() override;
   void SetAlwaysOnTop(bool top) override;
@@ -165,6 +167,11 @@ class NativeWindowViews : public NativeWindow,
 
   // Handles window state events.
   scoped_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
+  // resizable again.
+  extensions::SizeConstraints old_size_constraints_;
 #elif defined(OS_WIN)
   // Weak ref.
   AtomDesktopWindowTreeHostWin* atom_desktop_window_tree_host_win_;

From f607e81facac1dd27665ef4a81469ff1ea4bdd82 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 16:16:02 +0800
Subject: [PATCH 26/30] views: Make size constraints work immediately after set

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

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 6d89ee1d06e..4c8d014b1ec 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -390,6 +390,7 @@ gfx::Size NativeWindowViews::GetContentSize() {
 void NativeWindowViews::SetContentSizeConstraints(
     const extensions::SizeConstraints& size_constraints) {
   NativeWindow::SetContentSizeConstraints(size_constraints);
+  window_->OnSizeConstraintsChanged();
 #if defined(USE_X11)
   if (resizable_)
     old_size_constraints_ = size_constraints;

From c6d5a92d349bb376c4c6f78ed618b970d343258b Mon Sep 17 00:00:00 2001
From: Plusb Preco <plusb21@gmail.com>
Date: Tue, 6 Oct 2015 19:53:35 +0900
Subject: [PATCH 27/30] Update as upstream

---
 README-ko.md                                       |  2 +-
 docs-translations/ko-KR/api/native-image.md        |  2 +-
 docs-translations/ko-KR/api/process.md             |  6 ++++--
 docs-translations/ko-KR/api/screen.md              |  2 +-
 docs-translations/ko-KR/tutorial/quick-start.md    |  6 +++---
 .../ko-KR/tutorial/using-native-node-modules.md    | 14 ++++++++------
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/README-ko.md b/README-ko.md
index 1481e7ce3dc..c722243eb58 100644
--- a/README-ko.md
+++ b/README-ko.md
@@ -8,7 +8,7 @@
 
 :zap: *프레임워크 이름이 Atom Shell에서 Electron으로 변경되었습니다* :zap:
 
-Electron 프레임워크는 JavaScript, HTML 그리고 CSS를 사용하여 Cross-Platform 데스크톱 어플리케이션을 개발할 수 있도록 해주는 프레임워크입니다. 이 프레임워크는 [io.js](http://iojs.org) 와
+Electron 프레임워크는 JavaScript, HTML 그리고 CSS를 사용하여 Cross-Platform 데스크톱 어플리케이션을 개발할 수 있도록 해주는 프레임워크입니다. 이 프레임워크는 [Node.js](https://nodejs.org) 와
 [Chromium](http://www.chromium.org)을 기반으로 만들어 졌으며 [Atom Editor](https://github.com/atom/atom)에 사용되고 있습니다.
 
 Electron에 대한 중요한 알림을 받고 싶다면 Twitter에서 [@ElectronJS](https://twitter.com/electronjs)를 팔로우 하세요.
diff --git a/docs-translations/ko-KR/api/native-image.md b/docs-translations/ko-KR/api/native-image.md
index 423cedb9830..485ab7bc71d 100644
--- a/docs-translations/ko-KR/api/native-image.md
+++ b/docs-translations/ko-KR/api/native-image.md
@@ -142,4 +142,4 @@ var image = NativeImage.createFromPath('/Users/somebody/images/icon.png');
 
 이미지가 템플릿 이미지인지 확인합니다.
 
-[buffer]: https://iojs.org/api/buffer.html#buffer_class_buffer
+[buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer
diff --git a/docs-translations/ko-KR/api/process.md b/docs-translations/ko-KR/api/process.md
index 57ba0fa768a..a35c8b4e93d 100644
--- a/docs-translations/ko-KR/api/process.md
+++ b/docs-translations/ko-KR/api/process.md
@@ -17,9 +17,11 @@ Electron 내부 초기화 스크립트의 로드가 완료되고, 웹 페이지
 
 ```javascript
 // preload.js
+var _setImmediate = setImmediate;
+var _clearImmediate = clearImmediate;
 process.once('loaded', function() {
-  global.setImmediate = setImmediate;
-  global.clearImmediate = clearImmediate;
+  global.setImmediate = _setImmediate;
+  global.clearImmediate = _clearImmediate;
 });
 ```
 
diff --git a/docs-translations/ko-KR/api/screen.md b/docs-translations/ko-KR/api/screen.md
index de2d8baf4e3..c65540eba22 100644
--- a/docs-translations/ko-KR/api/screen.md
+++ b/docs-translations/ko-KR/api/screen.md
@@ -45,7 +45,7 @@ app.on('ready', function() {
   if (externalDisplay) {
     mainWindow = new BrowserWindow({
       x: externalDisplay.bounds.x + 50,
-      y: externalDisplay.bounds.y + 50,
+      y: externalDisplay.bounds.y + 50
     });
   }
 });
diff --git a/docs-translations/ko-KR/tutorial/quick-start.md b/docs-translations/ko-KR/tutorial/quick-start.md
index 3edf13cc473..6eaad747695 100644
--- a/docs-translations/ko-KR/tutorial/quick-start.md
+++ b/docs-translations/ko-KR/tutorial/quick-start.md
@@ -3,7 +3,7 @@
 ## 소개
 
 Electron은 자바스크립트와 함께 제공된 풍부한 네이티브 API를 사용하여 멋진 데스크탑 어플리케이션을 만들 수 있도록 해주는 프레임워크입니다.
-이 프레임워크의 io.js(node.js)는 웹 서버 개발이 아닌 데스크탑 어플리케이션 개발에 초점을 맞췄습니다.
+이 프레임워크의 Node.js는 웹 서버 개발이 아닌 데스크탑 어플리케이션 개발에 초점을 맞췄습니다.
 
 이 말은 Electron이 GUI 라이브러리의 자바스크립트 바인딩이라는 뜻이 아닙니다.
 대신, Electron은 웹 페이지의 GUI를 사용합니다. 쉽게 말해 Electron은 자바스크립트를 사용하여 조작하는 작은 Chromium 브라우저로 볼 수 있습니다.
@@ -19,7 +19,7 @@ Electron이 웹페이지를 보여줄 때 Chromium의 multi-processes 구조도
 Electron 프로세스 내에서 작동하는 웹 페이지를 __랜더러 프로세스__ 라고 불립니다.
 
 보통 일반 브라우저의 웹 페이지들은 샌드박스가 적용된 환경에서 작동하며 네이티브 리소스에는 접근할 수 없도록 되어 있습니다.
-하지만 Electron은 웹 페이지 내에서 io.js(node.js) API를 사용하여 low-level 수준으로 운영체제와 상호작용할 수 있습니다.
+하지만 Electron은 웹 페이지 내에서 Node.js API를 사용하여 low-level 수준으로 운영체제와 상호작용할 수 있습니다.
 
 ### 메인 프로세스와 랜더러 프로세스의 차이점
 
@@ -116,7 +116,7 @@ app.on('ready', function() {
   </head>
   <body>
     <h1>헬로 월드!</h1>
-    이 어플리케이션은 io.js <script>document.write(process.version)</script> 과
+    이 어플리케이션은 Node.js <script>document.write(process.version)</script> 과
     Electron <script>document.write(process.versions['electron'])</script>을 사용합니다.
   </body>
 </html>
diff --git a/docs-translations/ko-KR/tutorial/using-native-node-modules.md b/docs-translations/ko-KR/tutorial/using-native-node-modules.md
index ed64abb492f..6a0c67770b0 100644
--- a/docs-translations/ko-KR/tutorial/using-native-node-modules.md
+++ b/docs-translations/ko-KR/tutorial/using-native-node-modules.md
@@ -5,14 +5,16 @@ Electron에선 node.js 네이티브 모듈이 지원됩니다. 하지만 Electro
 
 ## 네이티브 node 모듈 호환성
 
-Node v0.11.x 버전부터는 V8 API의 중대한 변경이 있었습니다. 하지만 대부분의 네이티브 모듈은 Node v0.10.x 버전을 타겟으로 작성 되었기 때문에
-새로운 Node 또는 io.js 버전에서 작동하지 않을 수 있습니다. Electron은 내부적으로 __io.js v3.1.0__ 버전을 사용하기 때문에 호환성 문제가 발생할 수 있습니다.
+네이티브 모듈은 node.js가 새로운 V8 버전을 사용함으로 인해 작동하지 않을 수 있습니다.
+사용하는 네이티브 모듈이 Electron에 맞춰 작동할 수 있도록 하려면 Electron에서 사용하는 node.js의 버전을 확인할 필요가 있습니다.
+Electron에서 사용하는 node 버전은 [releases](https://github.com/atom/electron/releases)에서 확인할 수 있으며
+`process.version`을 출력하여 버전을 확인할 수도 있습니다. ([시작하기](https://github.com/atom/electron/blob/master/docs/tutorial/quick-start.md)의 예제를 참고하세요)
 
-이 문제를 해결하기 위해선 모듈이 v0.11.x 또는 최신 버전을 지원할 수 있도록 변경해야 합니다.
-현재 [많은 모듈들](https://www.npmjs.org/browse/depended/nan)이 안정적으로 두 버전 모두 지원하고 있지만 오래된 모듈의 경우 여전히 Node v0.10.x 버전만을 지원하고 있습니다.
-예를 들어 [nan](https://github.com/rvagg/nan) 모듈을 사용해야 한다면 Node v0.11.x 또는 최신 버전의 Node와 io.js로 포팅 할 필요가 있습니다.
+혹시 직접 만든 네이티브 모듈이 있다면 [NAN](https://github.com/nodejs/nan/) 모듈을 사용하는 것을 고려해보는 것이 좋습니다.
+이 모듈은 다중 버전의 node.js를 지원하기 쉽게 해줍니다. 이를 통해 오래된 모듈을 새 버전의 node.js에 맞게 포팅할 수 있습니다.
+Electron도 이 모듈을 통해 포팅된 네이티브 모듈을 사용할 수 있습니다.
 
-## 네이티브 모듈 설치하는 방법
+## 네이티브 모듈을 설치하는 방법
 
 네이티브 모듈을 설치하는 방법은 세 가지 종류가 있습니다.
 

From c916baa93968c6d874a94696a0f44868bbc18f11 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 21:40:08 +0800
Subject: [PATCH 28/30] Update brightray, fix #2315

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

diff --git a/vendor/brightray b/vendor/brightray
index c44f99278bc..9e97c2b5bf5 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit c44f99278bc4f6823f81b6f3a8d75881d697fd01
+Subproject commit 9e97c2b5bf5aa455f863bb29f99a219bdda4d29d

From 927c3f34c3759e29948a1ffaa76a4985d38a1d69 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 22:25:55 +0800
Subject: [PATCH 29/30] Guard against undefined, fix #2995

In theory this should never happen, seems like some object is garbage
collected after the JavaScript context has been destroyed.
---
 atom/browser/lib/objects-registry.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/atom/browser/lib/objects-registry.coffee b/atom/browser/lib/objects-registry.coffee
index ccfe2dbe0ad..667adbc24e9 100644
--- a/atom/browser/lib/objects-registry.coffee
+++ b/atom/browser/lib/objects-registry.coffee
@@ -34,6 +34,7 @@ class ObjectsRegistry extends EventEmitter
     @dereference id, 1
     # Also reduce the count in owner.
     pointer = @owners[webContentsId]
+    return unless pointer?
     --pointer[id]
     delete pointer[id] if pointer[id] is 0
 
@@ -57,6 +58,7 @@ class ObjectsRegistry extends EventEmitter
   # Private: Dereference the object from store.
   dereference: (id, count) ->
     pointer = @storage[id]
+    return unless pointer?
     pointer.count -= count
     if pointer.count is 0
       v8Util.deleteHiddenValue pointer.object, 'atomId'

From 5bdc077b486885e5769230b40c4ae7f54b29aea9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Oct 2015 22:45:00 +0800
Subject: [PATCH 30/30] Update brightray for #2855

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

diff --git a/vendor/brightray b/vendor/brightray
index 9e97c2b5bf5..c25b9b27845 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 9e97c2b5bf5aa455f863bb29f99a219bdda4d29d
+Subproject commit c25b9b27845a308e6a6a5966dad057d721b1f3d1