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) {
-    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;
-    }
-  }

[Avi (use Gerrit), 2012/10/14 18:26:53]

This code made no sense. Shell windows have TabContents, so if you call
TabContents::FromWebContents on them, you will get non-NULL back. From what I
see, this if() block was NEVER true...

[jennb, 2012/10/15 16:42:33]

ShellWindows aren't supposed to have TabContents. Ben Wells has a TODO to undo
that change.  http://crbug.com/151493

[Avi (use Gerrit), 2012/10/15 16:45:06]

Oh, so this code predates that.

Does this look reasonable to you, then, to drop this entire section?

[jennb, 2012/10/15 17:08:17]

Looks reasonable to me as no TabContents are needed here after this change, so
it won't matter whether ShellWindow has tabcontents or not.

[Avi (use Gerrit), 2012/10/15 17:39:48]

That's exactly the point ;)

 
   // 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