CrOS - Fix file picker to route callbacks using TabContents

chrome/browser/ui/views/extensions/extension_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/extensions/extension_dialog.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 36 matching lines @@
   host->render_view_host()->view()->Focus();
 }
 
 ExtensionDialog::~ExtensionDialog() {
 }
 
 // static
 ExtensionDialog* ExtensionDialog::Show(
     const GURL& url,
     Browser* browser,
+    TabContents* tab_contents,
     int width,
     int height,
     ExtensionDialogObserver* observer) {
   CHECK(browser);
   ExtensionProcessManager* manager =
       browser->profile()->GetExtensionProcessManager();
   DCHECK(manager);
   if (!manager)
     return NULL;
   ExtensionHost* host = manager->CreateDialogHost(url, browser);
-  DCHECK(host);
+  if (!host)
+    return NULL;
+  host->set_associated_tab_contents(tab_contents);
   return new ExtensionDialog(browser, host, width, height, observer);
 }
 
 void ExtensionDialog::ObserverDestroyed() {
   observer_ = NULL;
 }
 
 void ExtensionDialog::Close() {
   if (!window_)
     return;
@@ skipping 60 matching lines @@
       // If we aren't the host of the popup, then disregard the notification.
       if (Details<ExtensionHost>(host()) != details)
         return;
       Close();
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }