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

chrome/browser/extensions/extension_view_host.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/extensions/extension_view_host.h"
 
 #include "base/strings/string_piece.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/window_controller.h"
@@ skipping 109 matching lines @@
                      extensions::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
                      content::Source<Extension>(extension()));
     return;
   }
 
   // Popups may spawn modal dialogs, which need positioning information.
   if (extension_host_type() == VIEW_TYPE_EXTENSION_POPUP) {
     WebContentsModalDialogManager::CreateForWebContents(host_contents());
     WebContentsModalDialogManager::FromWebContents(
         host_contents())->SetDelegate(this);
-    if (!popup_manager_.get())
-      popup_manager_.reset(new web_modal::PopupManager(this));
-    popup_manager_->RegisterWith(host_contents());
   }
 
   ExtensionHost::LoadInitialURL();
 }
 
 bool ExtensionViewHost::IsBackgroundPage() const {
   DCHECK(view_);
   return false;
 }
 
@@ skipping 173 matching lines @@
 
 void ExtensionViewHost::InsertInfobarCSS() {
   static const base::StringPiece css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_EXTENSIONS_INFOBAR_CSS));
 
   host_contents()->InsertCSS(css.as_string());
 }
 
 }  // namespace extensions