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

components/web_modal/web_contents_modal_dialog_manager.h

 // Copyright 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 COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
 #define COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
 
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 29 matching lines @@
   // bubble clients.
   void ShowDialogWithManager(
       NativeWebContentsModalDialog dialog,
       scoped_ptr<SingleWebContentsDialogManager> manager);
 
   // Returns true if any dialogs are active and not closed.
   bool IsDialogActive() const;
 
   // Focus the topmost modal dialog.  IsDialogActive() must be true when calling
   // this function.
-  void FocusTopmostDialog() const;
+  void FocusTopmostDialog();
 
-  // SingleWebContentsDialogManagerDelegate:
+  // Overriden from SingleWebContentsDialogManagerDelegate:
   virtual content::WebContents* GetWebContents() const OVERRIDE;
+  // Called when a WebContentsModalDialogs we own is about to be closed.
   virtual void WillClose(NativeWebContentsModalDialog dialog) OVERRIDE;
 
   // For testing.
   class TestApi {
    public:
     explicit TestApi(WebContentsModalDialogManager* manager)
         : manager_(manager) {}
 
     void CloseAllDialogs() { manager_->CloseAllDialogs(); }
     void DidAttachInterstitialPage() { manager_->DidAttachInterstitialPage(); }
     void WebContentsWasShown() { manager_->WasShown(); }
     void WebContentsWasHidden() { manager_->WasHidden(); }
 
    private:
     WebContentsModalDialogManager* manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
  private:
   explicit WebContentsModalDialogManager(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsModalDialogManager>;
-  friend class PopupManager;
 
   struct DialogState {
     DialogState(NativeWebContentsModalDialog dialog,
                 scoped_ptr<SingleWebContentsDialogManager> manager);
     ~DialogState();
 
     NativeWebContentsModalDialog dialog;
     scoped_ptr<SingleWebContentsDialogManager> manager;
   };
 
@@ skipping 29 matching lines @@
 
   // True while closing the dialogs on WebContents close.
   bool closing_all_dialogs_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogManager);
 };
 
 }  // namespace web_modal
 
 #endif  // COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_