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

Use bundle's name as application name when we have one.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-05 10:42:04 +08:00
parent a614134144
commit fc4ed9be12
4 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
browser/browser.cc
View file

@ -48,7 +48,13 @@ void Browser::SetVersion(const std::string& version) {
}
std::string Browser::GetName() const {
return name_override_.empty() ? "Atom-Shell" : name_override_;
if (name_override_.empty()) {
std::string name = GetExecutableFileProductName();
if (!name.empty())
return name;
}
return name_override_;
}
void Browser::SetName(const std::string& name) {

3
browser/browser.h
View file

@ -80,6 +80,9 @@ class Browser : public WindowListObserver {
// Returns the version of application bundle or executable file.
std::string GetExecutableFileVersion() const;
// Returns the name of application bundle or executable file.
std::string GetExecutableFileProductName() const;
// Send the will-quit message and then terminate the application.
void NotifyAndTerminate();

6
browser/browser_mac.mm
View file

@ -25,6 +25,12 @@ std::string Browser::GetExecutableFileVersion() const {
return base::SysNSStringToUTF8(version);
}
std::string Browser::GetExecutableFileProductName() const {
NSDictionary* infoDictionary = base::mac::OuterBundle().infoDictionary;
NSString *version = [infoDictionary objectForKey:@"CFBundleName"];
return base::SysNSStringToUTF8(version);
}
void Browser::CancelQuit() {
[[AtomApplication sharedApplication] replyToApplicationShouldTerminate:NO];
}

14
browser/browser_win.cc
View file

@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
#include "common/atom_version.h"
namespace atom {
@ -51,7 +52,18 @@ std::string Browser::GetExecutableFileVersion() const {
return UTF16ToUTF8(version_info->product_version());
}
return "";
return ATOM_VERSION_STRING;
}
std::string Browser::GetExecutableFileProductName() const {
base::FilePath path;
if (PathService::Get(base::FILE_EXE, &path)) {
scoped_ptr<FileVersionInfo> version_info(
FileVersionInfo::CreateFileVersionInfo(path));
return UTF16ToUTF8(version_info->product_name());
}
return "Atom-Shell";
}
void Browser::CancelQuit() {