Clone of issue 600130. (http://codereview.chromium.org/600130)

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/593111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39077 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 1 deletions

diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h
index 0b25afb..154d258 100644
--- a/chrome/browser/external_tab_container.h
+++ b/chrome/browser/external_tab_container.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/views/frame/browser_bubble_host.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "chrome/browser/views/unhandled_keyboard_event_handler.h"
 #include "chrome/common/navigation_types.h"
@@ -39,7 +40,8 @@ class ExternalTabContainer : public TabContentsDelegate,
                              public views::WidgetWin,
                              public base::RefCounted<ExternalTabContainer>,
                              public views::AcceleratorTarget,
-                             public InfoBarContainer::Delegate {
+                             public InfoBarContainer::Delegate,
+                             public BrowserBubbleHost {
  public:
   typedef std::map<intptr_t, scoped_refptr<ExternalTabContainer> > PendingTabs;
 
@@ -89,6 +91,12 @@ class ExternalTabContainer : public TabContentsDelegate,
   // ExternalTabContainer window
   static bool IsExternalTabContainer(HWND window);
 
+  // A helper function that returns a pointer to the ExternalTabContainer
+  // instance associated with a native view.  Returns NULL if the window
+  // is not an ExternalTabContainer.
+  static ExternalTabContainer* GetExternalContainerFromNativeWindow(
+      gfx::NativeView native_window);
+
   // A helper method that retrieves the ExternalTabContainer object that
   // hosts the given tab window.
   static ExternalTabContainer* GetContainerForTab(HWND tab_window);