From 2d8d328f0218fe4d6d54d5429ca683a136696340 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 14 Apr 2015 15:55:41 +0800 Subject: [PATCH] Rename hard-coded application names in code --- atom/browser/browser_linux.cc | 5 +++-- atom/browser/browser_mac.mm | 16 ++++++---------- atom/browser/browser_win.cc | 4 ++-- atom/browser/default_app/index.html | 8 ++++---- atom/browser/default_app/main.js | 4 ++-- atom/browser/default_app/package.json | 5 ++--- atom/browser/node_debugger.cc | 2 +- .../crash_reporter/crash_reporter_linux.cc | 2 +- atom/common/crash_reporter/crash_reporter_mac.mm | 2 +- atom/common/crash_reporter/crash_reporter_win.cc | 2 +- .../crash_reporter/win/crash_service_main.cc | 2 +- atom/common/linux/application_info.cc | 2 +- atom/renderer/lib/override.coffee | 2 +- 13 files changed, 26 insertions(+), 30 deletions(-) diff --git a/atom/browser/browser_linux.cc b/atom/browser/browser_linux.cc index 7534aa2182d..ea8fb7c10c5 100644 --- a/atom/browser/browser_linux.cc +++ b/atom/browser/browser_linux.cc @@ -9,6 +9,7 @@ #include "atom/browser/native_window.h" #include "atom/browser/window_list.h" #include "atom/common/atom_version.h" +#include "brightray/common/application_info.h" namespace atom { @@ -31,11 +32,11 @@ void Browser::ClearRecentDocuments() { } std::string Browser::GetExecutableFileVersion() const { - return ATOM_VERSION_STRING; + return brightray::GetApplicationVersion(); } std::string Browser::GetExecutableFileProductName() const { - return "Atom-Shell"; + return brightray::GetApplicationName(); } } // namespace atom diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm index 06c2b434779..2353aa6c42c 100644 --- a/atom/browser/browser_mac.mm +++ b/atom/browser/browser_mac.mm @@ -4,13 +4,13 @@ #include "atom/browser/browser.h" -#import "atom/browser/mac/atom_application.h" -#import "atom/browser/mac/atom_application_delegate.h" +#include "atom/browser/mac/atom_application.h" +#include "atom/browser/mac/atom_application_delegate.h" #include "atom/browser/native_window.h" #include "atom/browser/window_list.h" -#import "base/mac/bundle_locations.h" -#import "base/mac/foundation_util.h" +#include "base/mac/foundation_util.h" #include "base/strings/sys_string_conversions.h" +#include "brightray/common/application_info.h" namespace atom { @@ -27,15 +27,11 @@ void Browser::ClearRecentDocuments() { } std::string Browser::GetExecutableFileVersion() const { - NSDictionary* infoDictionary = base::mac::OuterBundle().infoDictionary; - NSString *version = [infoDictionary objectForKey:@"CFBundleVersion"]; - return base::SysNSStringToUTF8(version); + return brightray::GetApplicationVersion(); } std::string Browser::GetExecutableFileProductName() const { - NSDictionary* infoDictionary = base::mac::OuterBundle().infoDictionary; - NSString *version = [infoDictionary objectForKey:@"CFBundleName"]; - return base::SysNSStringToUTF8(version); + return brightray::GetApplicationName(); } int Browser::DockBounce(BounceType type) { diff --git a/atom/browser/browser_win.cc b/atom/browser/browser_win.cc index 211a1ebf63d..b861af94542 100644 --- a/atom/browser/browser_win.cc +++ b/atom/browser/browser_win.cc @@ -118,7 +118,7 @@ void Browser::SetUserTasks(const std::vector& tasks) { } void Browser::SetAppUserModelID(const std::string& name) { - app_user_model_id_ = base::string16(L"atom-shell.app."); + app_user_model_id_ = base::string16(L"electron.app."); app_user_model_id_ += base::UTF8ToUTF16(name); SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str()); } @@ -142,7 +142,7 @@ std::string Browser::GetExecutableFileProductName() const { return base::UTF16ToUTF8(version_info->product_name()); } - return "Atom-Shell"; + return ATOM_PRODUCT_NAME; } } // namespace atom diff --git a/atom/browser/default_app/index.html b/atom/browser/default_app/index.html index 469b57cdad1..96e45806d5d 100644 --- a/atom/browser/default_app/index.html +++ b/atom/browser/default_app/index.html @@ -75,16 +75,16 @@

Welcome to Electron

- To run your app with atom-shell, execute the following command under your + To run your app with Electron, execute the following command under your Console (or Terminal):

- The path-to-your-app should be the path to your own atom-shell - app, you can read the quick start - guide in atom-shell's docs + The path-to-your-app should be the path to your own Electron + app, you can read the quick start + guide in Electron's docs on how to write one.

diff --git a/atom/browser/default_app/main.js b/atom/browser/default_app/main.js index 06de0e26529..bdb88a7cc29 100644 --- a/atom/browser/default_app/main.js +++ b/atom/browser/default_app/main.js @@ -50,7 +50,7 @@ if (option.file && !option.webdriver) { } catch(e) { if (e.code == 'MODULE_NOT_FOUND') { app.focus(); - dialog.showErrorBox('Error opening app', 'The app provided is not a valid atom-shell app, please read the docs on how to write one:\nhttps://github.com/atom/atom-shell/tree/master/docs'); + dialog.showErrorBox('Error opening app', 'The app provided is not a valid electron app, please read the docs on how to write one:\nhttps://github.com/atom/electron/tree/master/docs'); process.exit(1); } else { console.error('App threw an error when running', e); @@ -58,7 +58,7 @@ if (option.file && !option.webdriver) { } } } else if (option.version) { - console.log('v' + process.versions['atom-shell']); + console.log('v' + process.versions['electron']); process.exit(0); } else { require('./default_app.js'); diff --git a/atom/browser/default_app/package.json b/atom/browser/default_app/package.json index 28305088f3d..d6c736cbc52 100644 --- a/atom/browser/default_app/package.json +++ b/atom/browser/default_app/package.json @@ -1,6 +1,5 @@ { - "name": "atom-shell-default-app", - "productName": "Electron Default App", - "version": "0.1.0", + "name": "electron", + "productName": "Electron", "main": "main.js" } diff --git a/atom/browser/node_debugger.cc b/atom/browser/node_debugger.cc index 0b8cc3bcbc3..4e2302763c7 100644 --- a/atom/browser/node_debugger.cc +++ b/atom/browser/node_debugger.cc @@ -126,7 +126,7 @@ void NodeDebugger::SendConnectMessage() { "Protocol-Version: 1\r\n" "Embedding-Host: %s\r\n" "%s: 0\r\n", - v8::V8::GetVersion(), "Atom-Shell", kContentLength), true); + v8::V8::GetVersion(), ATOM_PRODUCT_NAME, kContentLength), true); } // static diff --git a/atom/common/crash_reporter/crash_reporter_linux.cc b/atom/common/crash_reporter/crash_reporter_linux.cc index 89e2f7e76a2..8a5608dad0c 100644 --- a/atom/common/crash_reporter/crash_reporter_linux.cc +++ b/atom/common/crash_reporter/crash_reporter_linux.cc @@ -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; diff --git a/atom/common/crash_reporter/crash_reporter_mac.mm b/atom/common/crash_reporter/crash_reporter_mac.mm index 5875bc78f0f..c251e0e0d10 100644 --- a/atom/common/crash_reporter/crash_reporter_mac.mm +++ b/atom/common/crash_reporter/crash_reporter_mac.mm @@ -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]; diff --git a/atom/common/crash_reporter/crash_reporter_win.cc b/atom/common/crash_reporter/crash_reporter_win.cc index 6164a508db8..e5c5edc582a 100644 --- a/atom/common/crash_reporter/crash_reporter_win.cc +++ b/atom/common/crash_reporter/crash_reporter_win.cc @@ -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())); diff --git a/atom/common/crash_reporter/win/crash_service_main.cc b/atom/common/crash_reporter/win/crash_service_main.cc index dd2d8fbab6d..0bd72deba9e 100644 --- a/atom/common/crash_reporter/win/crash_service_main.cc +++ b/atom/common/crash_reporter/win/crash_service_main.cc @@ -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; diff --git a/atom/common/linux/application_info.cc b/atom/common/linux/application_info.cc index 7bbb9d425a9..053bd4bb863 100644 --- a/atom/common/linux/application_info.cc +++ b/atom/common/linux/application_info.cc @@ -9,7 +9,7 @@ namespace brightray { std::string GetApplicationName() { - return "Atom-Shell"; + return ATOM_PRODUCT_NAME; } std::string GetApplicationVersion() { diff --git a/atom/renderer/lib/override.coffee b/atom/renderer/lib/override.coffee index bb469711adf..6e02c2eb822 100644 --- a/atom/renderer/lib/override.coffee +++ b/atom/renderer/lib/override.coffee @@ -72,7 +72,7 @@ window.confirm = (message, title='') -> # But we do not support prompt(). window.prompt = -> - throw new Error('prompt() is and will not be supported in atom-shell.') + throw new Error('prompt() is and will not be supported.') window.opener = postMessage: (message, targetOrigin='*') ->