Rename process.__atom_type to process.type.

diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index c9ce616..67ac258 100644 (file)
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -3,7 +3,7 @@ path = require 'path'
 util = require 'util'
 
 # Expose information of current process.
-process.__atom_type = 'browser'
+process.type = 'browser'
 process.resourcesPath = path.resolve process.argv[1], '..', '..', '..', '..'
 
 # We modified the original process.argv to let node.js load the atom.js,

diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index 838f39f..29ec5ec 100644 (file)
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -80,9 +80,9 @@ v8::Handle<v8::Value> Binding(v8::Handle<v8::String> module) {
       Get(v8::String::New("process"))->ToObject();
   DCHECK(!process.IsEmpty());
 
-  // is_browser = process.__atom_type == 'browser'.
+  // is_browser = process.type == 'browser'.
   bool is_browser = std::string("browser") == *v8::String::Utf8Value(
-      process->Get(v8::String::New("__atom_type")));
+      process->Get(v8::String::New("type")));
 
   // Cached in process.__atom_binding_cache.
   v8::Local<v8::Object> binding_cache;

diff --git a/atom/common/api/lib/clipboard.coffee b/atom/common/api/lib/clipboard.coffee
index 99a5754..6fc075f 100644 (file)
--- a/atom/common/api/lib/clipboard.coffee
+++ b/atom/common/api/lib/clipboard.coffee
@@ -1,5 +1,5 @@
 module.exports =
-  if process.platform is 'linux' and process.__atom_type is 'renderer'
+  if process.platform is 'linux' and process.type is 'renderer'
     # On Linux we could not access clipboard in renderer process.
     require('remote').process.atomBinding 'clipboard'
   else

diff --git a/atom/common/api/lib/crash-reporter.coffee b/atom/common/api/lib/crash-reporter.coffee
index b99d70f..ecbd2f1 100644 (file)
--- a/atom/common/api/lib/crash-reporter.coffee
+++ b/atom/common/api/lib/crash-reporter.coffee
@@ -15,7 +15,7 @@ class CrashReporter
     extra._productName ?= productName
     extra._companyName ?= companyName
     extra._version ?=
-      if process.__atom_type is 'browser'
+      if process.type is 'browser'
         require('app').getVersion()
       else
         require('remote').require('app').getVersion()

diff --git a/atom/common/api/lib/shell.coffee b/atom/common/api/lib/shell.coffee
index 74acaf8..8e06826 100644 (file)
--- a/atom/common/api/lib/shell.coffee
+++ b/atom/common/api/lib/shell.coffee
@@ -1,4 +1,4 @@
 module.exports = process.atomBinding 'shell'
 
-if process.platform is 'win32' and process.__atom_type is 'renderer'
+if process.platform is 'win32' and process.type is 'renderer'
   module.exports.showItemInFolder = require('remote').process.atomBinding('shell').showItemInFolder

diff --git a/atom/renderer/lib/init.coffee b/atom/renderer/lib/init.coffee
index e781ac4..09474c9 100644 (file)
--- a/atom/renderer/lib/init.coffee
+++ b/atom/renderer/lib/init.coffee
@@ -3,7 +3,7 @@ url    = require 'url'
 Module = require 'module'
 
 # Expose information of current process.
-process.__atom_type = 'renderer'
+process.type = 'renderer'
 process.resourcesPath = path.resolve process.argv[1], '..', '..', '..', '..'
 
 # We modified the original process.argv to let node.js load the

diff --git a/vendor/node b/vendor/node
index 82fa737..4e45fee 160000 (submodule)
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 82fa7375af135444b37d8c21fade33ee3d905c42
+Subproject commit 4e45fee905bc6d0605ba40f312991bcf76ab3cba