mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #1389 from atom/rename-to-electron

Browse source 
Rename to electron
This commit is contained in:
Cheng Zhao 2015-04-17 15:22:07 +08:00
commit cd0aa4a956
76 changed files with 375 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/common/api/atom_bindings.cc
View file

@ -63,7 +63,8 @@ void AtomBindings::BindTo(v8::Isolate* isolate,
mate::Dictionary versions;
if (dict.Get("versions", &versions)) {
versions.Set("atom-shell", ATOM_VERSION_STRING);
versions.Set(ATOM_PROJECT_NAME, ATOM_VERSION_STRING);
versions.Set("atom-shell", ATOM_VERSION_STRING); // For compatibility.
versions.Set("chrome", CHROME_VERSION_STRING);
}
}

14
atom/common/api/lib/crash-reporter.coffee
View file

@ -8,7 +8,13 @@ class CrashReporter
start: (options={}) ->
{@productName, companyName, submitUrl, autoSubmit, ignoreSystemCrashHandler, extra} = options
@productName ?= 'Atom-Shell'
app =
if process.type is 'browser'
require 'app'
else
require('remote').require 'app'
@productName ?= app.getName()
companyName ?= 'GitHub, Inc'
submitUrl ?= 'http://54.249.141.255:1127/post'
autoSubmit ?= true
@ -17,11 +23,7 @@ class CrashReporter
extra._productName ?= @productName
extra._companyName ?= companyName
extra._version ?=
if process.type is 'browser'
require('app').getVersion()
else
require('remote').require('app').getVersion()
extra._version ?= app.getVersion()
start = => binding.start @productName, companyName, submitUrl, autoSubmit, ignoreSystemCrashHandler, extra

2
atom/common/crash_reporter/crash_reporter_linux.cc
View file

@ -64,7 +64,7 @@ void CrashReporterLinux::InitBreakpad(const std::string& product_name,
bool skip_system_crash_handler) {
EnableCrashDumping(product_name);
crash_keys_.SetKeyValue("prod", "Atom-Shell");
crash_keys_.SetKeyValue("prod", ATOM_PRODUCT_NAME);
crash_keys_.SetKeyValue("ver", version.c_str());
upload_url_ = submit_url;

2
atom/common/crash_reporter/crash_reporter_mac.mm
View file

@ -32,7 +32,7 @@ void CrashReporterMac::InitBreakpad(const std::string& product_name,
NSMutableDictionary* parameters =
[NSMutableDictionary dictionaryWithCapacity:4];
[parameters setValue:@"Atom-Shell"
[parameters setValue:@ATOM_PRODUCT_NAME
forKey:@BREAKPAD_PRODUCT];
[parameters setValue:base::SysUTF8ToNSString(product_name)
forKey:@BREAKPAD_PRODUCT_DISPLAY];

2
atom/common/crash_reporter/crash_reporter_win.cc
View file

@ -103,7 +103,7 @@ google_breakpad::CustomClientInfo* CrashReporterWin::GetCustomInfo(
custom_info_entries_.reserve(2 + upload_parameters_.size());
custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
L"prod", L"Atom-Shell"));
L"prod", L"Electron"));
custom_info_entries_.push_back(google_breakpad::CustomInfoEntry(
L"ver", base::UTF8ToWide(version).c_str()));

2
atom/common/crash_reporter/win/crash_service_main.cc
View file

@ -73,7 +73,7 @@ int Main(const wchar_t* cmd) {
NULL);
cmd_line.AppendSwitch("no-window");
cmd_line.AppendSwitchASCII("max-reports", "128");
cmd_line.AppendSwitchASCII("reporter", "atom-shell-crash-service");
cmd_line.AppendSwitchASCII("reporter", ATOM_PROJECT_NAME "-crash-service");
cmd_line.AppendSwitchNative("pipe-name", pipe_name);
breakpad::CrashService crash_service;

2
atom/common/linux/application_info.cc
View file

@ -9,7 +9,7 @@
namespace brightray {
std::string GetApplicationName() {
return "Atom-Shell";
return ATOM_PRODUCT_NAME;
}
std::string GetApplicationVersion() {

7
atom/common/node_bindings.cc
View file

@ -15,6 +15,7 @@
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_paths.h"
#include "native_mate/locker.h"
#include "native_mate/dictionary.h"
@ -27,7 +28,7 @@ using content::BrowserThread;
#define REFERENCE_MODULE(name) \
extern "C" void _register_ ## name(void); \
void (*fp_register_ ## name)(void) = _register_ ## name
// Atom Shell's builtin modules.
// Electron's builtin modules.
REFERENCE_MODULE(atom_browser_app);
REFERENCE_MODULE(atom_browser_auto_updater);
REFERENCE_MODULE(atom_browser_content_tracing);
@ -157,6 +158,10 @@ node::Environment* NodeBindings::CreateEnvironment(
mate::Dictionary process(context->GetIsolate(), env->process_object());
process.Set("type", process_type);
process.Set("resourcesPath", resources_path);
// The path to helper app.
base::FilePath helper_exec_path;
PathService::Get(content::CHILD_PROCESS_EXE, &helper_exec_path);
process.Set("helperExecPath", helper_exec_path);
return env;
}

6
atom/common/resources/mac/Info.plist
View file

@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>Atom Framework</string>
<string>${PRODUCT_NAME} Framework</string>
<key>CFBundleIdentifier</key>
<string>com.github.AtomFramework</string>
<string>${ATOM_BUNDLE_ID}</string>
<key>CFBundleName</key>
<string>Atom Framework</string>
<string>${PRODUCT_NAME} Framework</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>

6
atom/common/resources/mac/MainMenu.xib
View file

@ -57,7 +57,7 @@
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="238522557">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">About Atom</string>
<string key="NSTitle">About</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="229763992"/>
@ -118,7 +118,7 @@
</object>
<object class="NSMenuItem" id="755159360">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">Hide Atom</string>
<string key="NSTitle">Hide</string>
<string key="NSKeyEquiv">h</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -154,7 +154,7 @@
</object>
<object class="NSMenuItem" id="632727374">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">Quit Atom</string>
<string key="NSTitle">Quit</string>
<string key="NSKeyEquiv">q</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>