Rename process.__atom_type to process.type.

This commit is contained in:
Cheng Zhao 2014-05-21 22:44:43 +08:00
parent 70c96eeac6
commit 9721c4e761
7 changed files with 8 additions and 8 deletions

View file

@ -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,

View file

@ -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;

View file

@ -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

View file

@ -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()

View file

@ -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

View file

@ -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

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 82fa7375af135444b37d8c21fade33ee3d905c42
Subproject commit 4e45fee905bc6d0605ba40f312991bcf76ab3cba