Fix regression with extension popup bubbles on Mac.

chrome/browser/extensions/extension_host.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 91 matching lines @@
   // Insert a default style sheet for Extension Infobars.
   void InsertInfobarCSS();
 
   // Tell the renderer not to draw scrollbars on windows smaller than
   // |size_limit| in both width and height.
   void DisableScrollbarsForSmallWindows(const gfx::Size& size_limit);
 
   // TabContentsObserver
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+  virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewReady() OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
   virtual void DocumentAvailableInMainFrame() OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
 
   // TabContentsDelegate
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut) OVERRIDE;
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event)
       OVERRIDE;
@@ skipping 59 matching lines @@
   scoped_ptr<ExtensionView> view_;
 #elif defined(OS_MACOSX)
   scoped_ptr<ExtensionViewMac> view_;
 #elif defined(TOOLKIT_GTK)
   scoped_ptr<ExtensionViewGtk> view_;
 #endif
 
   // The host for our HTML content.
   scoped_ptr<TabContents> host_contents_;
 
+  // A weak pointer to the current or pending RenderViewHost. We don't access
+  // this through the host_contents because we want to deal with the pending
+  // host, so we can send messages to it before it finishes loading.
+  RenderViewHost* render_view_host_;
+
   // Whether the RenderWidget has reported that it has stopped loading.
   bool did_stop_loading_;
 
   // True if the main frame has finished parsing.
   bool document_element_available_;
 
   // The original URL of the page being hosted.
   GURL initial_url_;
 
   content::NotificationRegistrar registrar_;
 
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   // Only EXTENSION_INFOBAR, EXTENSION_POPUP, and EXTENSION_BACKGROUND_PAGE
   // are used here, others are not hosted by ExtensionHost.
   content::ViewType extension_host_type_;
 
   // The relevant TabContents associated with this ExtensionHost, if any.
   TabContents* associated_tab_contents_;
 
   // Used to measure how long it's been since the host was created.
   PerfTimer since_created_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHost);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_