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

chrome/browser/browser.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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 1145 matching lines @@
 }
 
 void Browser::FocusSearch() {
   // TODO(beng): replace this with FocusLocationBar
   UserMetrics::RecordAction("FocusSearch", profile_);
   window_->GetLocationBar()->FocusSearch();
 }
 
 void Browser::OpenFile() {
   UserMetrics::RecordAction("OpenFile", profile_);
+
+  TabContents* contents = GetSelectedTabContents();
+  if (!contents) {                                // Avoid crashing in release.
+    NOTREACHED();
+    return;
+  }
+
+  // TODO(beng): figure out how to juggle this.
+#if defined(OS_MACOSX)
+  // TODO(viettrungluu): If there's a constrained dialog in the current tab, we
+  // should probably just create a new tab and go do the open there. (Why not
+  // just close the current dialog, esp. if it's not important? If we did that,
+  // then the previous one should come back with its original state on cancel.)
+  if (!contents->CanCreateConstrainedDialog()) {
+    if (type() == TYPE_NORMAL) {
+      contents = AddBlankTab(true);
+      if (!contents) {                            // Avoid crashing in release.
+        NOTREACHED();
+        return;
+      }
+    } else {
+      // TODO(viettrungluu): the other cases.
+      NOTIMPLEMENTED();
+      return;
+    }
+  }
+
+  if (!contents->CanCreateConstrainedDialog()) {  // Avoid crashing in release.
+    NOTREACHED();
+    return;
+  }
+
   if (!select_file_dialog_.get())
     select_file_dialog_ = SelectFileDialog::Create(this);
-
-  // TODO(beng): figure out how to juggle this.
+  select_file_dialog_->SelectFileInTab(SelectFileDialog::SELECT_OPEN_FILE,
+                                       string16(), FilePath(),
+                                       NULL, 0, FILE_PATH_LITERAL(""),
+                                       contents, NULL);
+#else
+  if (!select_file_dialog_.get())
+    select_file_dialog_ = SelectFileDialog::Create(this);
   gfx::NativeWindow parent_window = window_->GetNativeHandle();
   select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
                                   string16(), FilePath(),
                                   NULL, 0, FILE_PATH_LITERAL(""),
                                   parent_window, NULL);
+#endif
 }
 
 void Browser::OpenCreateShortcutsDialog() {
   UserMetrics::RecordAction("CreateShortcut", profile_);
 #if defined(OS_WIN) || defined(OS_LINUX)
   TabContents* current_tab = GetSelectedTabContents();
   DCHECK(current_tab && web_app::IsValidUrl(current_tab->GetURL())) <<
       "Menu item should be disabled.";
 
   NavigationEntry* entry = current_tab->controller().GetLastCommittedEntry();
@@ skipping 1963 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }