Add AshDesktopMediaList and enable Desktop Capture API on Chrome OS.

chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

 // Copyright 2013 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/extensions/api/desktop_capture/desktop_capture_api.h"
 
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/media/desktop_media_list_ash.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/native_desktop_media_list.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/extensions/api/tabs.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
@@ skipping 133 matching lines @@
     error_ = kEmptySourcesListError;
     return false;
   }
 
   scoped_ptr<DesktopMediaList> media_list;
   if (g_picker_factory) {
     media_list = g_picker_factory->CreateModel(
         show_screens, show_windows);
     picker_ = g_picker_factory->CreatePicker();
   } else {
+#if defined(USE_ASH)
+    if (chrome::IsNativeWindowInAsh(parent_window)) {
+      media_list.reset(new DesktopMediaListAsh(
+          (show_screens ? DesktopMediaListAsh::SCREENS : 0) |
+          (show_windows ? DesktopMediaListAsh::WINDOWS : 0)));
+    } else
+#endif
+    {
+      webrtc::DesktopCaptureOptions options =
+          webrtc::DesktopCaptureOptions::CreateDefault();
+      options.set_disable_effects(false);
+      scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
+          show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
+      scoped_ptr<webrtc::WindowCapturer> window_capturer(
+          show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
+
+      media_list.reset(new NativeDesktopMediaList(
+          screen_capturer.Pass(), window_capturer.Pass()));
+    }
+
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
-#if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
-    webrtc::DesktopCaptureOptions options =
-        webrtc::DesktopCaptureOptions::CreateDefault();
-    options.set_disable_effects(false);
-    scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
-        show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
-    scoped_ptr<webrtc::WindowCapturer> window_capturer(
-        show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
-
-    media_list.reset(new NativeDesktopMediaList(
-        screen_capturer.Pass(), window_capturer.Pass()));
+#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
     picker_ = DesktopMediaPicker::Create();
 #else
     error_ = "Desktop Capture API is not yet implemented for this platform.";
     return false;
 #endif
   }
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this);
 
   picker_->Show(parent_window, parent_window,
@@ skipping 70 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions