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

chrome/browser/ui/browser.h

 // Copyright (c) 2012 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_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 73 matching lines @@
 class Image;
 class Point;
 }
 
 namespace ui {
 struct SelectedFileInfo;
 class WebDialogDelegate;
 }
 
 namespace web_modal {
-class PopupManager;
 class WebContentsModalDialogHost;
 }
 
 class Browser : public TabStripModelObserver,
                 public content::WebContentsDelegate,
                 public CoreTabHelperDelegate,
                 public SearchEngineTabHelperDelegate,
                 public SearchTabHelperDelegate,
                 public ChromeWebModalDialogManagerDelegate,
                 public BookmarkTabHelperDelegate,
@@ skipping 131 matching lines @@
   // |window()| will return NULL if called before |CreateBrowserWindow()|
   // is done.
   BrowserWindow* window() const { return window_; }
   ToolbarModel* toolbar_model() { return toolbar_model_.get(); }
   const ToolbarModel* toolbar_model() const { return toolbar_model_.get(); }
 #if defined(UNIT_TEST)
   void swap_toolbar_models(scoped_ptr<ToolbarModel>* toolbar_model) {
     toolbar_model->swap(toolbar_model_);
   }
 #endif
-  web_modal::PopupManager* popup_manager() {
-    return popup_manager_.get();
-  }
   TabStripModel* tab_strip_model() const { return tab_strip_model_.get(); }
   chrome::BrowserCommandController* command_controller() {
     return command_controller_.get();
   }
   SearchModel* search_model() { return search_model_.get(); }
   const SearchModel* search_model() const {
       return search_model_.get();
   }
   SearchDelegate* search_delegate() {
     return search_delegate_.get();
@@ skipping 566 matching lines @@
 
   // This Browser's type.
   const Type type_;
 
   // This Browser's profile.
   Profile* const profile_;
 
   // This Browser's window.
   BrowserWindow* window_;
 
-  // Manages popup windows (bubbles, tab-modals) visible overlapping this
-  // window. JS alerts are not handled by this manager.
-  scoped_ptr<web_modal::PopupManager> popup_manager_;
-
   scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_;
   scoped_ptr<TabStripModel> tab_strip_model_;
 
   // The application name that is also the name of the window to the shell.
   // This name should be set when:
   // 1) we launch an application via an application shortcut or extension API.
   // 2) we launch an undocked devtool window.
   std::string app_name_;
 
   // True if the source is trusted (i.e. we do not need to show the URL in a
@@ skipping 105 matching lines @@
   base::WeakPtrFactory<Browser> weak_factory_;
 
   scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_;
 
   scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_