Constrained Windows Cocoa: Part 4 Refactor ConstrainedWindowSupport

chrome/browser/ui/constrained_window_tab_helper.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/constrained_window_tab_helper.h"
 
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/render_messages.h"
@@ skipping 14 matching lines @@
 }
 
 ConstrainedWindowTabHelper::~ConstrainedWindowTabHelper() {
   DCHECK(child_windows_.empty());
 }
 
 void ConstrainedWindowTabHelper::AddConstrainedDialog(
     ConstrainedWindow* window) {
   child_windows_.push_back(window);
 
-  if (child_windows_.size() == 1) {
+  if (child_windows_.size() == 1 && window->CanShowConstrainedWindow()) {
     window->ShowConstrainedWindow();
     BlockTabContent(true);
   }
 }
 
 void ConstrainedWindowTabHelper::CloseConstrainedWindows() {
   // Clear out any constrained windows since we are leaving this page entirely.
   // To ensure that we iterate over every element in child_windows_ we
   // need to use a copy of child_windows_. Otherwise if
   // window->CloseConstrainedWindow() modifies child_windows_ we could end up
@@ skipping 58 matching lines @@
   }
 }
 
 void ConstrainedWindowTabHelper::WebContentsDestroyed(WebContents* tab) {
   // First cleanly close all child windows.
   // TODO(mpcomplete): handle case if MaybeCloseChildWindows() already asked
   // some of these to close.  CloseWindows is async, so it might get called
   // twice before it runs.
   CloseConstrainedWindows();
 }