[WebModals] New API for browser-scoped popup management.

chrome/browser/extensions/extension_view_host.h

Index: chrome/browser/extensions/extension_view_host.h
diff --git a/chrome/browser/extensions/extension_view_host.h b/chrome/browser/extensions/extension_view_host.h
index b345454e512248b22af67c4d76c9f5f30e555684..076ef97bc24d2dbc7b110076a5393211a01b7534 100644
--- a/chrome/browser/extensions/extension_view_host.h
+++ b/chrome/browser/extensions/extension_view_host.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "components/web_modal/popup_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "extensions/browser/extension_host.h"
@@ -30,6 +31,7 @@ namespace extensions {
 // The ExtensionHost for an extension that backs a view in the browser UI. For
 // example, this could be an extension popup, infobar or dialog, but not a
 // background page.
+// TODO(gbillock): See if we can remove WebContentsModalDialogManager here.
 class ExtensionViewHost
     : public ExtensionHost,
       public web_modal::WebContentsModalDialogManagerDelegate,
@@ -142,6 +144,12 @@ class ExtensionViewHost
   class AssociatedWebContentsObserver;
   scoped_ptr<AssociatedWebContentsObserver> associated_web_contents_observer_;
 
+  // Manage popups overlaying the WebContents in this EVH.
+  // TODO(gbillock): should usually not be used -- instead use the parent
+  // window's popup manager. Should only be used when the EVH is created without
+  // a parent window.
+  scoped_ptr<web_modal::PopupManager> popup_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionViewHost);
 };