Merge 167819 - Fix crash when programatically closing media gallery dialog

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_file_system_registry.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 98 matching lines @@
 
   on_finish_.Run();
   delete this;
 }
 
 const MediaGalleriesDialogController::KnownGalleryPermissions&
 MediaGalleriesDialogController::permissions() const {
   return known_galleries_;
 }
 
+content::WebContents* MediaGalleriesDialogController::web_contents() const {
+  return web_contents_;
+}
+
 void MediaGalleriesDialogController::FileSelected(const FilePath& path,
                                                   int index,
                                                   void* params) {
   // Try to find it in |known_galleries_|.
   MediaGalleryPrefInfo gallery;
   if (preferences_->LookUpGalleryByPath(path, &gallery) &&
       gallery.type != MediaGalleryPrefInfo::kBlackListed) {
     KnownGalleryPermissions::iterator iter =
         known_galleries_.find(gallery.pref_id);
 
@@ skipping 63 matching lines @@
     preferences_->SetGalleryPermissionForExtension(
         *extension_, id, true);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome