Remove TabContents from media galleries.

chrome/browser/media_gallery/media_galleries_dialog_controller.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.
 
 #include "chrome/browser/media_gallery/media_galleries_dialog_controller.h"
 
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 
 namespace chrome {
 
 MediaGalleriesDialogController::MediaGalleriesDialogController(
-    TabContents* tab_contents,
+    content::WebContents* web_contents,
     const Extension& extension,
     const base::Closure& on_finish)
-      : tab_contents_(tab_contents),
+      : web_contents_(web_contents),
         extension_(&extension),
         on_finish_(on_finish),
         preferences_(MediaGalleriesPreferencesFactory::GetForProfile(
-            tab_contents_->profile())) {
+            Profile::FromBrowserContext(web_contents->GetBrowserContext()))) {
   LookUpPermissions();
 
   dialog_.reset(MediaGalleriesDialog::Create(this));
 }
 
 MediaGalleriesDialogController::MediaGalleriesDialogController()
-    : tab_contents_(NULL),
+    : web_contents_(NULL),
       extension_(NULL),
       preferences_(NULL) {}
 
 MediaGalleriesDialogController::~MediaGalleriesDialogController() {
   if (select_folder_dialog_.get())
     select_folder_dialog_->ListenerDestroyed();
 }
 
 string16 MediaGalleriesDialogController::GetHeader() const {
   std::string extension_name(extension_ ? extension_->name() : "");
@@ skipping 19 matching lines @@
 void MediaGalleriesDialogController::OnAddFolderClicked() {
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   select_folder_dialog_ =
       ui::SelectFileDialog::Create(this, new ChromeSelectFilePolicy(NULL));
   select_folder_dialog_->SelectFile(
       ui::SelectFileDialog::SELECT_FOLDER,
       l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY_TITLE),
       user_data_dir,
       NULL, 0, FILE_PATH_LITERAL(""),
-      tab_contents_->web_contents()->GetView()->GetTopLevelNativeWindow(),
+      web_contents_->GetView()->GetTopLevelNativeWindow(),
       NULL);
 }
 
 void MediaGalleriesDialogController::DidToggleGallery(
     const MediaGalleryPrefInfo* gallery,
     bool enabled) {
   // Check known galleries.
   KnownGalleryPermissions::iterator iter =
       known_galleries_.find(gallery->pref_id);
   if (iter != known_galleries_.end()) {
@@ skipping 102 matching lines @@
     preferences_->SetGalleryPermissionForExtension(
         *extension_, id, true);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome