Add IsEmpty helper and remove GetInstance public usage

diff --git a/atom/browser/api/atom_api_auto_updater.cc b/atom/browser/api/atom_api_auto_updater.cc
index 60bbcbd..ea30241 100644 (file)
--- a/atom/browser/api/atom_api_auto_updater.cc
+++ b/atom/browser/api/atom_api_auto_updater.cc
@@ -87,14 +87,13 @@ void AutoUpdater::SetFeedURL(const std::string& url, mate::Arguments* args) {
 
 void AutoUpdater::QuitAndInstall() {
   // If we don't have any window then quitAndInstall immediately.
-  WindowList* window_list = WindowList::GetInstance();
-  if (window_list->empty()) {
+  if (WindowList::IsEmpty()) {
     auto_updater::AutoUpdater::QuitAndInstall();
     return;
   }
 
   // Otherwise do the restart after all windows have been closed.
-  window_list->AddObserver(this);
+  WindowList::AddObserver(this);
   WindowList::CloseAllWindows();
 }
 

diff --git a/atom/browser/browser.cc b/atom/browser/browser.cc
index 1df1f31..b2900a3 100644 (file)
--- a/atom/browser/browser.cc
+++ b/atom/browser/browser.cc
@@ -43,11 +43,10 @@ void Browser::Quit() {
   if (!is_quiting_)
     return;
 
-  atom::WindowList* window_list = atom::WindowList::GetInstance();
-  if (window_list->empty())
+  if (atom::WindowList::IsEmpty())
     NotifyAndShutdown();
-
-  window_list->CloseAllWindows();
+  else
+    atom::WindowList::CloseAllWindows();
 }
 
 void Browser::Exit(mate::Arguments* args) {
@@ -65,8 +64,7 @@ void Browser::Exit(mate::Arguments* args) {
     is_exiting_ = true;
 
     // Must destroy windows before quitting, otherwise bad things can happen.
-    atom::WindowList* window_list = atom::WindowList::GetInstance();
-    if (window_list->empty()) {
+    if (atom::WindowList::IsEmpty()) {
       Shutdown();
     } else {
       // Unlike Quit(), we do not ask to close window, but destroy the window

diff --git a/atom/browser/window_list.cc b/atom/browser/window_list.cc
index 8fa2ed6..374389e 100644 (file)
--- a/atom/browser/window_list.cc
+++ b/atom/browser/window_list.cc
@@ -32,6 +32,11 @@ WindowList::WindowVector WindowList::GetWindows() {
 }
 
 // static
+bool WindowList::IsEmpty() {
+  return GetInstance()->windows_.empty();
+}
+
+// static
 void WindowList::AddWindow(NativeWindow* window) {
   DCHECK(window);
   // Push |window| on the appropriate list instance.

diff --git a/atom/browser/window_list.h b/atom/browser/window_list.h
index 81ff5de..e336c80 100644 (file)
--- a/atom/browser/window_list.h
+++ b/atom/browser/window_list.h
@@ -20,11 +20,8 @@ class WindowList {
  public:
   typedef std::vector<NativeWindow*> WindowVector;
 
-  bool empty() const { return windows_.empty(); }
-
-  static WindowList* GetInstance();
-
   static WindowVector GetWindows();
+  static bool IsEmpty();
 
   // Adds or removes |window| from the list it is associated with.
   static void AddWindow(NativeWindow* window);
@@ -44,6 +41,8 @@ class WindowList {
   static void DestroyAllWindows();
 
  private:
+  static WindowList* GetInstance();
+
   WindowList();
   ~WindowList();