Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager

chrome/browser/ui/web_contents_modal_dialog_manager.cc

 // 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.
 
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 
 #include "chrome/browser/ui/web_contents_modal_dialog.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsModalDialogManager);
 
 WebContentsModalDialogManager::~WebContentsModalDialogManager() {
   DCHECK(child_dialogs_.empty());
 }
 
 void WebContentsModalDialogManager::AddDialog(
     WebContentsModalDialog* dialog) {
   child_dialogs_.push_back(dialog);
 
+  if (native_manager_)
+    native_manager_->ManageDialog(dialog->GetNativeWindow());
+
   if (child_dialogs_.size() == 1) {
     dialog->ShowWebContentsModalDialog();
     BlockWebContentsInteraction(true);
   }
 }
 
 void WebContentsModalDialogManager::WillClose(WebContentsModalDialog* dialog) {
   WebContentsModalDialogList::iterator i(
       std::find(child_dialogs_.begin(), child_dialogs_.end(), dialog));
   bool removed_topmost_dialog = i == child_dialogs_.begin();
@@ skipping 33 matching lines @@
 void WebContentsModalDialogManager::FocusTopmostDialog() {
   DCHECK(dialog_count());
   WebContentsModalDialog* window = *dialog_begin();
   DCHECK(window);
   window->FocusWebContentsModalDialog();
 }
 
 WebContentsModalDialogManager::WebContentsModalDialogManager(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      delegate_(NULL) {
+      delegate_(NULL),
+      native_manager_(
+          ALLOW_THIS_IN_INITIALIZER_LIST(CreateNativeManager(this))) {
 }
 
 void WebContentsModalDialogManager::CloseAllDialogs() {
   // Clear out any dialogs since we are leaving this page entirely.  To ensure
   // that we iterate over every element in child_dialogs_ we need to use a copy
   // of child_dialogs_. Otherwise if dialog->CloseWebContentsModalDialog()
   // modifies child_dialogs_ we could end up skipping some elements.
   WebContentsModalDialogList child_dialogs_copy(child_dialogs_);
   for (WebContentsModalDialogList::iterator it = child_dialogs_copy.begin();
        it != child_dialogs_copy.end(); ++it) {
@@ skipping 21 matching lines @@
   }
 }
 
 void WebContentsModalDialogManager::WebContentsDestroyed(WebContents* tab) {
   // First cleanly close all child dialogs.
   // TODO(mpcomplete): handle case if MaybeCloseChildWindows() already asked
   // some of these to close.  CloseAllDialogs is async, so it might get called
   // twice before it runs.
   CloseAllDialogs();
 }