Removed NOTIFICATION_BROWSER_CLOSING notification

chrome/browser/ui/extensions/extension_installed_bubble.cc

 // Copyright 2013 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/extensions/extension_installed_bubble.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.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/sync/sync_promo_ui.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "chrome/grit/generated_resources.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 
 namespace {
 
 // How long to wait for browser action animations to complete before retrying.
 const int kAnimationWaitMs = 50;
 // How often we retry when waiting for browser action animation to end.
 const int kAnimationWaitRetries = 10;
 
 // Class responsible for showing the bubble after it's installed. Owns itself.
 class ExtensionInstalledBubbleObserver
-    : public content::NotificationObserver,
+    : public chrome::BrowserListObserver,
       public extensions::ExtensionRegistryObserver {
  public:
   explicit ExtensionInstalledBubbleObserver(
       std::unique_ptr<ExtensionInstalledBubble> bubble)
       : bubble_(std::move(bubble)),
         extension_registry_observer_(this),
+        browser_list_observer_(this),
         animation_wait_retries_(0),
         weak_factory_(this) {
     // |extension| has been initialized but not loaded at this point. We need to
     // wait on showing the Bubble until the EXTENSION_LOADED gets fired.
     extension_registry_observer_.Add(
         extensions::ExtensionRegistry::Get(bubble_->browser()->profile()));
-
-    registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSING,
-                   content::Source<Browser>(bubble_->browser()));
+    browser_list_observer_.Add(BrowserList::GetInstance());
   }
 
   void Run() { OnExtensionLoaded(nullptr, bubble_->extension()); }
 
  private:
   ~ExtensionInstalledBubbleObserver() override {}
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override {
-    DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_CLOSING)
-        << "Received unexpected notification";
-    // Browser is closing before the bubble was shown.
-    // TODO(hcarmona): Look into logging this with the BubbleManager.
-    delete this;
+  // chrome::BrowserListObserver:
+  void OnBrowserCloseStarted(Browser* browser) override {
+    if (bubble_->browser() == browser) {
+      // Browser is closing before the bubble was shown.
+      // TODO(hcarmona): Look into logging this with the BubbleManager.
+      delete this;
+    }
   }
 
   // extensions::ExtensionRegistryObserver:
   void OnExtensionLoaded(content::BrowserContext* browser_context,
                          const extensions::Extension* extension) override {
     if (extension == bubble_->extension()) {
       // PostTask to ourself to allow all EXTENSION_LOADED Observers to run.
       // Only then can we be sure that a BrowserAction or PageAction has had
       // views created which we can inspect for the purpose of previewing of
       // pointing to them.
@@ skipping 44 matching lines @@
     }
   }
 
   // The bubble that will be shown when the extension has finished installing.
   std::unique_ptr<ExtensionInstalledBubble> bubble_;
 
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
       extension_registry_observer_;
 
-  content::NotificationRegistrar registrar_;
+  ScopedObserver<BrowserList, BrowserListObserver> browser_list_observer_;
 
   // The number of times to retry showing the bubble if the bubble_->browser()
   // action toolbar is animating.
   int animation_wait_retries_;
 
   base::WeakPtrFactory<ExtensionInstalledBubbleObserver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstalledBubbleObserver);
 };
 
@@ skipping 133 matching lines @@
       break;
     case OMNIBOX_KEYWORD:
       options_ |= HOW_TO_USE | HOW_TO_MANAGE;
       anchor_position_ = ANCHOR_OMNIBOX;
       break;
     case GENERIC:
       anchor_position_ = ANCHOR_APP_MENU;
       break;
   }
 }