Removed NOTIFICATION_BROWSER_CLOSING notification

chrome/browser/ui/tabs/pinned_tab_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tabs/pinned_tab_service.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "content/public/browser/notification_service.h"
 
 namespace {
 
 // Returns true if |browser| is the only normal (tabbed) browser for |browser|'s
 // profile (across all desktops).
 bool IsOnlyNormalBrowser(Browser* browser) {
   for (auto* b : *BrowserList::GetInstance()) {
     if (b != browser && b->is_type_tabbed() &&
         b->profile() == browser->profile()) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace
 
 PinnedTabService::PinnedTabService(Profile* profile)
     : profile_(profile),
       save_pinned_tabs_(true),
       has_normal_browser_(false) {
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_OPENED,
                  content::NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSING,
-                 content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_TAB_ADDED,
                  content::NotificationService::AllSources());
+  BrowserList::AddObserver(this);
 }
 
 void PinnedTabService::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   // Saving of tabs happens when saving is enabled, and when either the user
   // exits the application or closes the last browser window.
   // Saving is disabled when the user exits the application to prevent the
   // pin state of all the open browsers being overwritten by the state of the
   // last browser window to close.
@@ skipping 18 matching lines @@
       }
       save_pinned_tabs_ = true;
       break;
     }
 
     case chrome::NOTIFICATION_TAB_ADDED: {
       save_pinned_tabs_ = true;
       break;
     }
 
-    case chrome::NOTIFICATION_BROWSER_CLOSING: {
-      Browser* browser = content::Source<Browser>(source).ptr();
-      if (has_normal_browser_ && save_pinned_tabs_ &&
-          browser->profile() == profile_) {
-        if (IsOnlyNormalBrowser(browser)) {
-          has_normal_browser_ = false;
-          PinnedTabCodec::WritePinnedTabs(profile_);
-        }
-      }
-      break;
-    }
-
     case chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST: {
       if (has_normal_browser_ && save_pinned_tabs_) {
         PinnedTabCodec::WritePinnedTabs(profile_);
         save_pinned_tabs_ = false;
       }
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
+
+void PinnedTabService::OnBrowserCloseStarted(Browser* browser) {
+  if (has_normal_browser_ && save_pinned_tabs_ &&
+      browser->profile() == profile_) {
+    if (IsOnlyNormalBrowser(browser)) {
+      has_normal_browser_ = false;
+      PinnedTabCodec::WritePinnedTabs(profile_);
+    }
+  }
+}