media galleries dialog:

1 - fix a crash
2 - remove an ifdef that's no longer required

BUG=134929

Review URL: https://chromiumcodereview.appspot.com/10855087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151108 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/media_gallery/media_galleries_dialog_controller.cc

@@ -31,11 +31,7 @@ MediaGalleriesDialogController::MediaGalleriesDialogController(
           tab_contents_->profile())) {
   LookUpPermissions();
 
-#if defined(TOOLKIT_GTK)
   dialog_.reset(MediaGalleriesDialog::Create(this));
-#else
-  NOTIMPLEMENTED();
-#endif
 }
 
 MediaGalleriesDialogController::~MediaGalleriesDialogController() {

chrome/browser/media_gallery/media_galleries_dialog_controller.h

@@ -8,6 +8,7 @@
 #include <list>
 #include <map>
 
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
@@ -111,7 +112,7 @@ class MediaGalleriesDialogController : public ui::SelectFileDialog::Listener {
   NewGalleryPermissions new_galleries_;
 
   // We run this callback when done.
-  const base::Callback<void(void)>& on_finish_;
+  base::Callback<void(void)> on_finish_;
 
   // The model that tracks galleries and extensions' permissions.
   MediaGalleriesPreferences* preferences_;