Cocoa: Implement media gallery dialog

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 <string>
 #include <vector>
 
 #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"
 #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)
 #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 {
 
 namespace {
 
 const char kInvalidInteractive[] = "Unknown value for interactive.";
 
 }  // namespace
 
@@ skipping 65 matching lines @@
   WebContents* contents = WebContents::FromRenderViewHost(render_view_host());
   TabContents* tab_contents =
       contents ? TabContents::FromWebContents(contents) : NULL;
   if (!tab_contents) {
     // TODO(estade): for now it just gives up, but it might be nice to first
     // attempt to find the active window for this extension.
     ReturnGalleries();
     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 -------------------------------------
 
 MediaGalleriesAssembleMediaFileFunction::
     ~MediaGalleriesAssembleMediaFileFunction() {}
 
 bool MediaGalleriesAssembleMediaFileFunction::RunImpl() {
   // TODO(vandebo) Update the metadata and return the new file.
   SetResult(Value::CreateNullValue());
   return true;
 }
 
 }  // namespace extensions