Re-Revert "[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 a7599b43b986784e1d1d5275f361ea7866e49888..6201fc0e8ffe6498245c1161c87b0a3d6f76cf07 100644
--- a/chrome/browser/extensions/extension_view_host.h
+++ b/chrome/browser/extensions/extension_view_host.h
@@ -6,7 +6,6 @@
 #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"
@@ -25,7 +24,6 @@ class ExtensionView;
 // 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,
@@ -132,12 +130,6 @@ 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);
 };