Remove TabContents from media galleries.

chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

 // Copyright (c) 2012 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.
 
 // Implements the Chrome Extensions Media Galleries API.
 
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "base/stl_util.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 #include "chrome/browser/media_gallery/media_galleries_dialog_controller.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
-#include "chrome/browser/ui/extensions/shell_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/api/experimental_media_galleries.h"
 #include "chrome/common/extensions/api/media_galleries.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_WIN)
@@ skipping 121 matching lines @@
     }
     // TODO(vandebo) Handle write permission.
   }
 
   SetResult(list);
   SendResponse(true);
 }
 
 void MediaGalleriesGetMediaFileSystemsFunction::ShowDialog() {
   WebContents* contents = WebContents::FromRenderViewHost(render_view_host());
-  TabContents* tab_contents =
-      contents ? TabContents::FromWebContents(contents) : NULL;
-  if (!tab_contents) {

[Evan Stade, 2012/10/15 21:34:06]

this code was here in case the API was called from the background page. You
still need to do something similar, but I don't see that happening anywhere.

[Avi (use Gerrit), 2012/10/15 22:10:01]

Question: Suppose that the background page doesn't have a TabContents. Why does
the source page need a TabContents for this to work? What about a TabContents is
needed?

[Evan Stade, 2012/10/15 22:51:33]

the background page does not have a tab contents. That is why we have to find a
different one (i.e. the tab contents for the last-used shell window for the
app). This tab contents is necessary as the contents the constrained window sits
on top of/within.

[Avi (use Gerrit), 2012/10/17 22:15:42]

I have a fix, but found a related crash at the same time. If the background page
loads a constrained window on the shell window (as this code below does), and
then kicks off navigation on that window, the navigation completing cancels the
constrained window but doesn't hide it. When the user clicks a button it
crashes.

I can't commit a fix yet because I've got a dependency to fix. Working on this,
though.

[Evan Stade, 2012/10/17 22:18:59]

might that be fixed by r162402?

[Avi (use Gerrit), 2012/10/17 22:28:48]

This appears to be different. I'm verifying with a trunk build that doesn't have
this patch :) and I'll send you a bug.

[Evan Stade, 2012/10/17 22:35:11]

thanks.

-    ShellWindow* window = ShellWindowRegistry::Get(profile())->
-        GetCurrentShellWindowForApp(GetExtension()->id());
-    if (window) {
-      tab_contents = window->tab_contents();
-    } else {
-      // Abort showing the dialog. TODO(estade) Perhaps return an error instead.
-      GetAndReturnGalleries();
-      return;
-    }
-  }
 
   // Controller will delete itself.
   base::Closure cb = base::Bind(
       &MediaGalleriesGetMediaFileSystemsFunction::GetAndReturnGalleries, this);
-  new chrome::MediaGalleriesDialogController(tab_contents, *GetExtension(), cb);
+  new chrome::MediaGalleriesDialogController(contents, *GetExtension(), cb);
 }
 
 // MediaGalleriesAssembleMediaFileFunction -------------------------------------
 
 MediaGalleriesAssembleMediaFileFunction::
     ~MediaGalleriesAssembleMediaFileFunction() {}
 
 bool MediaGalleriesAssembleMediaFileFunction::RunImpl() {
   if (!ApiIsAccessible(&error_))
     return false;
 
   // TODO(vandebo) Update the metadata and return the new file.
   SetResult(Value::CreateNullValue());
   return true;
 }
 
 }  // namespace extensions