Mac: the return of the tab-modal-sheets patch.

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents/tab_contents.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
@@ skipping 313 matching lines @@
   // 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.
   int size = static_cast<int>(child_windows_.size());
   for (int i = size - 1; i >= 0; --i) {
     ConstrainedWindow* window = child_windows_[i];
     if (window)
       window->CloseConstrainedWindow();
   }
+  child_windows_.clear(); // Should be unnecessary, strictly speaking.
 
   if (blocked_popups_)
     blocked_popups_->Destroy();
 
   // Notify any observer that have a reference on this tab contents.
   NotificationService::current()->Notify(
       NotificationType::TAB_CONTENTS_DESTROYED,
       Source<TabContents>(this),
       NotificationService::NoDetails());
 
@@ skipping 410 matching lines @@
                                const NavigationEntry::SSLStatus& ssl,
                                bool show_history) {
   if (!delegate_)
     return;
 
   delegate_->ShowPageInfo(profile(), url, ssl, show_history);
 }
 
 ConstrainedWindow* TabContents::CreateConstrainedDialog(
       ConstrainedWindowDelegate* delegate) {
+  DCHECK(delegate);
+
   ConstrainedWindow* window =
       ConstrainedWindow::CreateConstrainedDialog(this, delegate);
+  DCHECK(window);
   child_windows_.push_back(window);
   return window;
 }
 
+void TabContents::NotifyChildrenOfPendingEvent(ConstrainedWindow::Event event) {
+  // Make a copy of the list, since child windows may delete themselves from it
+  // (or conceivably worse) while we're iterating through.
+  ConstrainedWindowList children = child_windows_;
+
+  ConstrainedWindowList::iterator it, end;
+  for (it = children.begin(), end = children.end(); it != end; ++it) {
+    if (*it)
+      (*it)->ParentWillDo(event);
+  }
+}
+
 void TabContents::AddNewContents(TabContents* new_contents,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
                                  bool user_gesture,
                                  const GURL& creator_url) {
   if (!delegate_)
     return;
 
   if ((disposition == NEW_POPUP) && !user_gesture &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 211 matching lines @@
 
   if (tab_contents && tab_contents->delegate())
     tab_contents->delegate()->OnStartDownload(download);
 }
 
 void TabContents::WillClose(ConstrainedWindow* window) {
   ConstrainedWindowList::iterator it =
       find(child_windows_.begin(), child_windows_.end(), window);
   if (it != child_windows_.end())
     child_windows_.erase(it);
+  else
+    NOTREACHED();
 }
 
 void TabContents::WillCloseBlockedPopupContainer(
     BlockedPopupContainer* container) {
   DCHECK(blocked_popups_ == container);
   blocked_popups_ = NULL;
 }
 
 void TabContents::DidMoveOrResize(ConstrainedWindow* window) {
 #if defined(OS_WIN)
@@ skipping 369 matching lines @@
   if (params.password_form.origin.is_valid())
     GetPasswordManager()->ProvisionallySavePassword(params.password_form);
 }
 
 void TabContents::MaybeCloseChildWindows(const GURL& previous_url,
                                          const GURL& current_url) {
   if (net::RegistryControlledDomainService::SameDomainOrHost(
           previous_url, current_url))
     return;
 
-  // Clear out any child windows since we are leaving this page entirely.
-  // We use indices instead of iterators in case CloseWindow does something
-  // that may invalidate an iterator.
-  int size = static_cast<int>(child_windows_.size());
-  for (int i = size - 1; i >= 0; --i) {
-    ConstrainedWindow* window = child_windows_[i];
-    if (window)
-      window->CloseConstrainedWindow();
-  }
+  // We inform constrained child windows that we are about to navigate away;
+  // they should close themselves in response if appropriate (e.g., if they are
+  // "content-area" windows).
+  NotifyChildrenOfPendingEvent(ConstrainedWindow::kEventNavigate);
 
   // Close the popup container.
   if (blocked_popups_) {
     blocked_popups_->Destroy();
     blocked_popups_ = NULL;
   }
 }
 
 void TabContents::UpdateStarredStateForCurrentURL() {
   BookmarkModel* model = profile()->GetBookmarkModel();
@@ skipping 848 matching lines @@
 }
 
 void TabContents::RunFileChooser(bool multiple_files,
                                  const string16& title,
                                  const FilePath& default_file) {
   if (!select_file_dialog_.get())
     select_file_dialog_ = SelectFileDialog::Create(this);
   SelectFileDialog::Type dialog_type =
     multiple_files ? SelectFileDialog::SELECT_OPEN_MULTI_FILE :
                      SelectFileDialog::SELECT_OPEN_FILE;
+#if defined(OS_MACOSX)
+  select_file_dialog_->SelectFileInTab(dialog_type, title, default_file, NULL,
+                                       0, FILE_PATH_LITERAL(""), this, NULL);
+#else
   select_file_dialog_->SelectFile(dialog_type, title, default_file,
                                   NULL, 0, FILE_PATH_LITERAL(""),
                                   view_->GetTopLevelNativeWindow(), NULL);
+#endif
 }
 
 void TabContents::RunJavaScriptMessage(
     const std::wstring& message,
     const std::wstring& default_prompt,
     const GURL& frame_url,
     const int flags,
     IPC::Message* reply_msg,
     bool* did_suppress_message) {
   // Suppress javascript messages when requested and when inside a constrained
@@ skipping 407 matching lines @@
   render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt);
 }
 
 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) {
   set_suppress_javascript_messages(suppress_message_boxes);
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }