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

Only add Hide if OS_X is defined

Browse source
This commit is contained in:
Simon Madine 2016-01-29 22:51:06 +01:00
parent 7a370ccd0f
commit 6a643ec3c8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_app.cc
View file

@ -356,7 +356,6 @@ mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
.SetMethod("quit", base::Bind(&Browser::Quit, browser))
.SetMethod("exit", base::Bind(&Browser::Exit, browser))
.SetMethod("focus", base::Bind(&Browser::Focus, browser))
.SetMethod("hide", base::Bind(&Browser::Hide, browser))
.SetMethod("getVersion", base::Bind(&Browser::GetVersion, browser))
.SetMethod("setVersion", base::Bind(&Browser::SetVersion, browser))
.SetMethod("getName", base::Bind(&Browser::GetName, browser))
@ -368,6 +367,9 @@ mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder(
base::Bind(&Browser::ClearRecentDocuments, browser))
.SetMethod("setAppUserModelId",
base::Bind(&Browser::SetAppUserModelID, browser))
#if defined(OS_MACOSX)
.SetMethod("hide", base::Bind(&Browser::Hide, browser))
#endif
#if defined(OS_WIN)
.SetMethod("setUserTasks",
base::Bind(&Browser::SetUserTasks, browser))

6
atom/browser/browser.h
View file

@ -55,9 +55,6 @@ class Browser : public WindowListObserver {
// Focus the application.
void Focus();
// Focus the application.
void Hide();
// Returns the version of the executable (or bundle).
std::string GetVersion() const;
@ -80,6 +77,9 @@ class Browser : public WindowListObserver {
void SetAppUserModelID(const base::string16& name);
#if defined(OS_MACOSX)
// Hide the application.
void Hide();
// Bounce the dock icon.
enum BounceType {
BOUNCE_CRITICAL = 0,