CrOS - Fix file picker to route callbacks using TabContents

chrome/browser/ui/views/file_manager_dialog.cc

 // Copyright (c) 2011 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/views/file_manager_dialog.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/extension_file_browser_private_api.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 164 matching lines @@
     NOTREACHED() << "Can't find owning browser";
     return;
   }
 
   FilePath virtual_path;
   if (!FileManagerUtil::ConvertFileToRelativeFileSystemPath(
           owner_browser->profile(), default_path, &virtual_path)) {
     virtual_path = FilePath();
   }
 
-  GURL file_browser_url = FileManagerUtil::GetFileBrowserUrlWithParams(
-      type, title, virtual_path, file_types, file_type_index,
-      default_extension);
-  extension_dialog_ = ExtensionDialog::Show(file_browser_url,
-      owner_browser, kFileManagerWidth, kFileManagerHeight,
-      this /* ExtensionDialog::Observer */);
-
   // Connect our listener to FileDialogFunction's per-tab callbacks.
   TabContentsWrapper* tab = owner_browser->GetSelectedTabContentsWrapper();
   int32 tab_id = (tab ? tab->restore_tab_helper()->session_id().id() : 0);
   PendingDialog::Add(tab_id, this);
 
+  GURL file_browser_url = FileManagerUtil::GetFileBrowserUrlWithParams(
+      type, title, virtual_path, file_types, file_type_index,
+      default_extension);
+  extension_dialog_ = ExtensionDialog::Show(file_browser_url,
+      owner_browser, tab->tab_contents(),
+      kFileManagerWidth, kFileManagerHeight,
+      this /* ExtensionDialog::Observer */);
+
   params_ = params;
   tab_id_ = tab_id;
   owner_window_ = owner_window;
 }