Cocoa: Implement media gallery dialog

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

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
index 047148ae462938934b6e904ee836fa7f86fdd06e..61aead53c0a9fc7c0bc62c1cc4a498b3481c36bc 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -12,6 +12,7 @@
 #include "base/platform_file.h"
 #include "base/values.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/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/api/experimental_media_galleries.h"
 #include "content/public/browser/child_process_security_policy.h"
@@ -23,10 +24,6 @@
 #include "base/sys_string_conversions.h"
 #endif
 
-#if !defined(OS_MACOSX)
-#include "chrome/browser/media_gallery/media_galleries_dialog_controller.h"
-#endif
-
 using content::WebContents;
 
 namespace extensions {
@@ -112,16 +109,11 @@ void MediaGalleriesGetMediaFileSystemsFunction::ShowDialog() {
     return;
   }
 
-#if !defined(OS_MACOSX)
   // Controller will delete itself.
   new chrome::MediaGalleriesDialogController(
       tab_contents, *GetExtension(),
       base::Bind(&MediaGalleriesGetMediaFileSystemsFunction::ReturnGalleries,
                  this));
-#else
-  // TODO(estade): implement dialog on Views and Cocoa.
-  ReturnGalleries();
-#endif
 }
 
 // MediaGalleriesAssembleMediaFileFunction -------------------------------------