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

chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 106 matching lines @@
       [controller_ performSelector:@selector(close)
                         withObject:nil
                         afterDelay:0.0];
     }
   }
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
     switch (type) {
-      case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
+      case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD: {
         if (content::Details<extensions::ExtensionViewHost>(
                 [controller_ extensionViewHost]) == details) {
           [controller_ showDevTools];
         }
         break;
       }
       default: {
         NOTREACHED() << "Received unexpected notification";
         break;
       }
@@ skipping 164 matching lines @@
              selector:@selector(extensionViewFrameChanged)
                  name:NSViewFrameDidChangeNotification
                object:extensionView_];
 
   notificationBridge_.reset(new DevtoolsNotificationBridge(self));
   registrar_.reset(new content::NotificationRegistrar);
   if (beingInspected_) {
     // Listen for the extension to finish loading so the dev tools can be
     // opened.
     registrar_->Add(notificationBridge_.get(),
-                    extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+                    extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
                     content::Source<BrowserContext>(host_->browser_context()));
   }
 }
 
 - (void)extensionViewFrameChanged {
   // If there are no changes in the width or height of the frame, then ignore.
   if (NSEqualSizes([extensionView_ frame].size, extensionFrame_.size))
     return;
 
   extensionFrame_ = [extensionView_ frame];
@@ skipping 51 matching lines @@
   // the notification is fired (and consequently the view contents have loaded).
   if (![window isVisible]) {
     [self showWindow:self];
   }
 }
 
 - (void)onSizeChanged:(NSSize)newSize {
   // When we update the size, the window will become visible. Stay hidden until
   // the host is loaded.
   pendingSize_ = newSize;
-  if (!host_ || !host_->did_stop_loading())
+  if (!host_ || !host_->has_loaded_once())
     return;
 
   // No need to use CA here, our caller calls us repeatedly to animate the
   // resizing.
   NSRect frame = [extensionView_ frame];
   frame.size = newSize;
 
   // |new_size| is in pixels. Convert to view units.
   frame.size = [extensionView_ convertSize:frame.size fromView:nil];
 
@@ skipping 37 matching lines @@
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end