Make LoadMonitoringExtensionHostQueue remove itself as an ExtensionHost observer at the correct tim…

apps/app_lifetime_monitor.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 "apps/app_lifetime_monitor.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 
 namespace apps {
 
 using extensions::AppWindow;
 using extensions::AppWindowRegistry;
 using extensions::Extension;
 using extensions::ExtensionHost;
 
 AppLifetimeMonitor::AppLifetimeMonitor(Profile* profile)
     : profile_(profile) {
   registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+                 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                  content::NotificationService::AllSources());
   registrar_.Add(
       this, chrome::NOTIFICATION_APP_TERMINATING,
       content::NotificationService::AllSources());
 
   AppWindowRegistry* app_window_registry =
       AppWindowRegistry::Factory::GetForBrowserContext(profile_,
                                                        false /* create */);
   DCHECK(app_window_registry);
   app_window_registry->AddObserver(this);
 }
 
 AppLifetimeMonitor::~AppLifetimeMonitor() {}
 
 void AppLifetimeMonitor::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppLifetimeMonitor::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void AppLifetimeMonitor::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
-    case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
+    case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD: {
       ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
       const Extension* extension = host->extension();
       if (!extension || !extension->is_platform_app())
         return;
 
       NotifyAppStart(extension->id());
       break;
     }
 
     case extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED: {
@@ skipping 71 matching lines @@
 
 void AppLifetimeMonitor::NotifyAppStop(const std::string& app_id) {
   FOR_EACH_OBSERVER(Observer, observers_, OnAppStop(profile_, app_id));
 }
 
 void AppLifetimeMonitor::NotifyChromeTerminating() {
   FOR_EACH_OBSERVER(Observer, observers_, OnChromeTerminating());
 }
 
 }  // namespace apps