Allow ChromeOS file selection dialog to be shown from shell windows.

chrome/browser/ui/views/select_file_dialog_extension.cc

Index: chrome/browser/ui/views/select_file_dialog_extension.cc
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index b8e3d26aa968a48a2d43028f7f94d3a5cc4e28f2..bc6e92d5cbb4e7c8aa768d82e6fc0e9db2b4458f 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -10,15 +10,20 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/shell_window_registry.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
+#include "chrome/browser/ui/base_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog.h"
 #include "content/public/browser/browser_thread.h"
@@ -96,7 +101,7 @@ SelectFileDialogExtension::SelectFileDialogExtension(Listener* listener)
     : SelectFileDialog(listener),
       has_multiple_file_type_choices_(false),
       tab_id_(0),
-      owner_browser_(NULL),
+      profile_(NULL),
       owner_window_(NULL),
       selection_type_(CANCEL),
       selection_index_(0),
@@ -121,7 +126,7 @@ void SelectFileDialogExtension::ListenerDestroyed() {
 
 void SelectFileDialogExtension::ExtensionDialogClosing(
     ExtensionDialog* dialog) {
-  owner_browser_ = NULL;
+  profile_ = NULL;
   owner_window_ = NULL;
   // Release our reference to the dialog to allow it to close.
   extension_dialog_ = NULL;
@@ -144,10 +149,10 @@ void SelectFileDialogExtension::ExtensionTerminated(
   // time, the extension subsystem would automatically reload it for us. At
   // this time though this is broken because of some faulty wiring in
   // ExtensionProcessManager::CreateViewHost. Once that is fixed, remove this.
-  if (owner_browser_) {
+  if (profile_) {
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(&ExtensionService::ReloadExtension,
-            base::Unretained(owner_browser_->profile()->GetExtensionService()),
+            base::Unretained(profile_->GetExtensionService()),
         extension_id));
   }
 
@@ -246,19 +251,55 @@ void SelectFileDialogExtension::SelectFileImpl(
     LOG(ERROR) << "File dialog already in use!";
     return;
   }
-  // Extension background pages may not supply an owner_window.
-  owner_browser_ = (owner_window ?
+
+  // The base window to associate the dialog with.
+  BaseWindow* base_window = NULL;
+
+  // The tab contents to associate the dialog with.
+  TabContents* tab = NULL;
+
+  // First try to find a Browser using the supplied owner_window. If no owner
+  // window has been supplied, this is running from a background page and should
+  // be associated with the last active browser.
+  Browser* owner_browser = (owner_window ?
       browser::FindBrowserWithWindow(owner_window) :
-      BrowserList::GetLastActive());
-  if (!owner_browser_) {
-    NOTREACHED() << "Can't find owning browser";
-    return;
+          BrowserList::GetLastActive());
+  if (owner_browser) {
+    base_window = owner_browser->window();
+    tab = owner_browser->GetActiveTabContents();
+    profile_ = tab->profile();
+  } else if (owner_window) {
+    // If an owner_window was supplied but we couldn't find a browser, this
+    // could be for a shell window.
+    // TODO(benwells): Find a better way to get a shell window from a native
+    // window.
+    std::vector<Profile*> profiles =
+        g_browser_process->profile_manager()->GetLoadedProfiles();
+    for (std::vector<Profile*>::const_iterator iter = profiles.begin();
+        iter < profiles.end(); iter++) {

[stevenjb (google-dont-use), 2012/06/22 17:29:00]

nit: alignment

[benwells, 2012/06/22 21:54:29]

Done.

+      ShellWindowRegistry* registry = ShellWindowRegistry::Get(*iter);
+      DCHECK(registry);
+      ShellWindow* shell_window = registry->GetShellWindowForNativeWindow(
+          owner_window);
+      if (shell_window) {
+        base_window = shell_window;
+        tab = shell_window->tab_contents();
+        profile_ = *iter;
+        break;
+      }
+    }
   }

[stevenjb (google-dont-use), 2012/06/22 17:29:00]

I think what you really want to use here is ExtensionWindowList
(chrome/browser/extensions/extension_window_list.h). That contains a list of
ExtensionWindowController instances, which should include all Browser and
ShellWindow instances (and eventually Panels also).

ExtensionWindowController contains both a Profile* and a BaseWindow*. BaseWindow
already has a GetNativeWindow() method, so you could replace
ShellWindowRegistry::GetShellWindowForNativeWindow with
ExtensionWindowList::GetWindowForNativeWindow(owner_window) and get BaseWindow
and Profile from there. You might need to add GetActiveTabContents to
BaseWindow, which seems fine.

[benwells, 2012/06/22 19:51:48]

This looks like a great plan, and I had most of the code written when I realised
there is no ExtensionWindowController for ShellWindows. This was removed as
shell window's aren't controllable via the chrome.windows API.

Given that ExtensionWindowList is really a list of windows which are
controllable via chrome.windows this no longer feels like a good way forward.

 
-  TabContents* tab = owner_browser_->GetActiveTabContents();
+  if (!base_window) {
+    NOTREACHED() << "Can't find owning window.";
+    return;
+  }
+  DCHECK(profile_);
 
   // Check if we have another dialog opened in the tab. It's unlikely, but
-  // possible.
+  // possible. If there is no tab contents use a tab_id of 0. A dialog without
+  // an associated tab contents will be shown fully screen; only one at a time
+  // is allowed in this state.
   int32 tab_id = tab ? tab->restore_tab_helper()->session_id().id() : 0;
   if (PendingExists(tab_id)) {
     DLOG(WARNING) << "Pending dialog exists with id " << tab_id;
@@ -267,7 +308,7 @@ void SelectFileDialogExtension::SelectFileImpl(
 
   FilePath virtual_path;
   if (!file_manager_util::ConvertFileToRelativeFileSystemPath(
-          owner_browser_->profile(), default_path, &virtual_path)) {
+          profile_, default_path, &virtual_path)) {
     virtual_path = default_path.BaseName();
   }
 
@@ -278,8 +319,8 @@ void SelectFileDialogExtension::SelectFileImpl(
       type, title, virtual_path, file_types, file_type_index,
       default_extension);
 
-  ExtensionDialog* dialog = ExtensionDialog::Show(file_browser_url,
-      owner_browser_, tab->web_contents(),
+ExtensionDialog* dialog = ExtensionDialog::Show(file_browser_url,
+      base_window, profile_, tab->web_contents(),
       kFileManagerWidth, kFileManagerHeight,
 #if defined(USE_AURA)
       file_manager_util::GetTitleFromType(type),