Add AshDesktopMediaList and enable Desktop Capture API on Chrome OS.

content/browser/renderer_host/media/desktop_capture_device_ash.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.

[hshi1, 2013/12/13 01:28:51]

This file has already been renamed to desktop_capture_device_aura.cc -- it would
be great if you rebase and resolve to ToT.

[Sergey Ulanov, 2013/12/13 02:54:29]

Done.

 // 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_ash.h"
 
 #include "base/logging.h"
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "content/browser/aura/image_transport_factory.h"
@@ skipping 64 matching lines @@
   // The window associated with the desktop.
   aura::Window* desktop_window_;
 
   // The layer associated with the desktop.
   ui::Layer* desktop_layer_;
 
   // The timer that kicks off period captures.
   base::Timer timer_;
 
   // The id of the window being captured.
-  const DesktopMediaID& window_id_;
+  DesktopMediaID window_id_;
 
   // Makes all the decisions about which frames to copy, and how.
   scoped_refptr<ThreadSafeCaptureOracle> oracle_proxy_;
 
   // YUV readback pipeline.
   scoped_ptr<content::ReadbackYUVInterface> yuv_readback_pipeline_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopVideoCaptureMachine);
 };
 
@@ skipping 41 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 102 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 DesktopCaptureDeviceAsh::StopAndDeAllocate() {
   impl_->StopAndDeAllocate();
 }
 
 }  // namespace content