Add AshDesktopMediaList and enable Desktop Capture API on Chrome OS.

content/browser/renderer_host/media/desktop_capture_device_aura.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 "content/browser/renderer_host/media/desktop_capture_device_aura.h"
 
 #include "base/logging.h"
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 199 matching lines @@
                           false));
 
   started_ = true;
   return true;
 }
 
 void DesktopVideoCaptureMachine::Stop() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Stop observing window events.
-  if (desktop_window_)
+  if (desktop_window_) {
     desktop_window_->RemoveObserver(this);
+    desktop_window_ = NULL;
+  }
 
   // Stop observing compositor updates.
   if (desktop_layer_) {
     ui::Compositor* compositor = desktop_layer_->GetCompositor();
     if (compositor)
       compositor->RemoveObserver(this);
+    desktop_layer_ = NULL;
   }
 
   // Stop timer.
   timer_.Stop();
 
   started_ = false;
 }
 
 void DesktopVideoCaptureMachine::UpdateCaptureSize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 45 matching lines @@
     RenderCursorOnVideoFrame(target, cursor_bitmap, cursor_position);
   release_callback->Run(0, false);
   capture_frame_cb.Run(start_time, result);
 }
 
 void DesktopVideoCaptureMachine::DidCopyOutput(
     scoped_refptr<media::VideoFrame> video_frame,
     base::Time start_time,
     const ThreadSafeCaptureOracle::CaptureFrameCallback& capture_frame_cb,
     scoped_ptr<cc::CopyOutputResult> result) {
-  if (result->IsEmpty() || result->size().IsEmpty())
+  if (result->IsEmpty() || result->size().IsEmpty() || !desktop_layer_)
     return;
 
   // Compute the dest size we want after the letterboxing resize. Make the
   // coordinates and sizes even because we letterbox in YUV space
   // (see CopyRGBToVideoFrame). They need to be even for the UV samples to
   // line up correctly.
   // The video frame's coded_size() and the result's size() are both physical
   // pixels.
   gfx::Rect region_in_frame =
       media::ComputeLetterboxRegion(gfx::Rect(video_frame->coded_size()),
@@ skipping 85 matching lines @@
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   DCHECK(desktop_window_ && window == desktop_window_);
 
   // Post task to update capture size on UI thread.
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &DesktopVideoCaptureMachine::UpdateCaptureSize, AsWeakPtr()));
 }
 
 void DesktopVideoCaptureMachine::OnWindowDestroyed(aura::Window* window) {
-  DCHECK(desktop_window_ && window == desktop_window_);
-  desktop_window_ = NULL;
-  desktop_layer_ = NULL;
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // Post task to stop capture on UI thread.
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
-      &DesktopVideoCaptureMachine::Stop, AsWeakPtr()));
+  Stop();
+
+  oracle_proxy_->ReportError();
 }
 
 void DesktopVideoCaptureMachine::OnCompositingEnded(
     ui::Compositor* compositor) {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &DesktopVideoCaptureMachine::Capture, AsWeakPtr(), true));
 }
 
 }  // namespace
 
@@ skipping 17 matching lines @@
     scoped_ptr<Client> client) {
   DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
   impl_->AllocateAndStart(params, client.Pass());
 }
 
 void DesktopCaptureDeviceAura::StopAndDeAllocate() {
   impl_->StopAndDeAllocate();
 }
 
 }  // namespace content