Implement 'activiate' event instead of 'activate-with-open-windows'.

atom/browser/api/atom_api_app.cc

@@ -171,8 +171,8 @@ void App::OnActivateWithNoOpenWindows() {
   Emit("activate-with-no-open-windows");
 }
 
-void App::OnActivateWithOpenWindows() {
-  Emit("activate-with-open-windows");
+void App::OnActivate(bool hasVisibleWindows) {
+  Emit("activate", hasVisibleWindows);
 }
 
 void App::OnWillFinishLaunching() {

atom/browser/api/atom_api_app.h

@@ -42,7 +42,7 @@ class App : public mate::EventEmitter,
   void OnOpenFile(bool* prevent_default, const std::string& file_path) override;
   void OnOpenURL(const std::string& url) override;
   void OnActivateWithNoOpenWindows() override;
-  void OnActivateWithOpenWindows() override;
+  void OnActivate(bool hasVisibleWindows) override;
   void OnWillFinishLaunching() override;
   void OnFinishLaunching() override;
   void OnSelectCertificate(

atom/browser/browser.cc

@@ -98,8 +98,8 @@ void Browser::ActivateWithNoOpenWindows() {
   FOR_EACH_OBSERVER(BrowserObserver, observers_, OnActivateWithNoOpenWindows());
 }
 
-void Browser::ActivateWithOpenWindows() {
-  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnActivateWithOpenWindows());
+void Browser::Activate(bool hasVisibleWindows) {
+  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnActivate(hasVisibleWindows));
 }
 
 void Browser::WillFinishLaunching() {

atom/browser/browser.h

@@ -111,8 +111,9 @@ class Browser : public WindowListObserver {
   // Tell the application that application is activated with no open windows.
   void ActivateWithNoOpenWindows();
 
-  // Tell the application that application is activated with open windows.
-  void ActivateWithOpenWindows();
+  // Tell the application that application is activated with visible/invisible
+  // windows.
+  void Activate(bool hasVisibleWindows);
 
   // Tell the application the loading has been done.
   void WillFinishLaunching();

atom/browser/browser_observer.h

@@ -47,9 +47,9 @@ class BrowserObserver {
   // dock icon).
   virtual void OnActivateWithNoOpenWindows() {}
 
-  // The browser is activated with open windows (usually by clicking on the dock
-  // icon).
-  virtual void OnActivateWithOpenWindows() {}
+  // The browser is activated with visible/invisible windows (usually by
+  // clicking on the dock icon).
+  virtual void OnActivate(bool hasVisibleWindows) {}
 
   // The browser has finished loading.
   virtual void OnWillFinishLaunching() {}

atom/browser/mac/atom_application_delegate.mm

@@ -52,8 +52,8 @@
 - (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
                     hasVisibleWindows:(BOOL)flag {
   atom::Browser* browser = atom::Browser::Get();
+  browser->Activate(static_cast<bool>(flag));
   if (flag) {
-    browser->ActivateWithOpenWindows();
     return YES;
   } else {
     browser->ActivateWithNoOpenWindows();

docs/api/app.md

@@ -100,10 +100,15 @@ Emitted when the application is activated while there are no open windows, which
 usually happens when the user has closed all of the application's windows and
 then clicks on the application's dock icon.
 
-### Event: activated-with-open-windows _OS X_
+### Event: 'activate' _OS X_
 
-Emitted when the application is activated while there are open windows, which
-usually happens when clicks on the applications's dock icon.
+Returns:
+
+* `event` Event
+* `hasVisibleWindows` Bool
+
+Emitted when the application is activated, which usually happens when clicks on
+the applications's dock icon.
 
 ### Event: 'browser-window-blur'