Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/chromeos/aura_desktop_capturer.cc

 // Copyright 2014 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 "remoting/host/chromeos/aura_desktop_capturer.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 22 matching lines @@
   scoped_ptr<SkBitmap> bitmap_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaBitmapDesktopFrame);
 };
 
 // static
 SkiaBitmapDesktopFrame* SkiaBitmapDesktopFrame::Create(
     scoped_ptr<SkBitmap> bitmap) {
 
   webrtc::DesktopSize size(bitmap->width(), bitmap->height());
-  DCHECK_EQ(kRGBA_8888_SkColorType, bitmap->info().colorType())
-      << "DesktopFrame objects always hold RGBA data.";
+  DCHECK_EQ(kBGRA_8888_SkColorType, bitmap->info().colorType())
+      << "DesktopFrame objects always hold BGRA data.";
 
   uint8_t* bitmap_data = reinterpret_cast<uint8_t*>(bitmap->getPixels());
 
   SkiaBitmapDesktopFrame* result = new SkiaBitmapDesktopFrame(
       size, bitmap->rowBytes(), bitmap_data, bitmap.Pass());
 
   return result;
 }
 
 SkiaBitmapDesktopFrame::SkiaBitmapDesktopFrame(webrtc::DesktopSize size,
@@ skipping 54 matching lines @@
   const webrtc::DesktopRect& rect = webrtc::DesktopRect::MakeWH(
       frame->size().width(), frame->size().height());
 
   // TODO(kelvinp): Set Frame DPI according to the screen resolution.
   // See cc::Layer::contents_scale_(x|y)() and frame->set_depi().
   frame->mutable_updated_region()->SetRect(rect);
 
   callback_->OnCaptureCompleted(frame.release());
 }
 
+bool AuraDesktopCapturer::GetScreenList(ScreenList* screens) {

[Wez, 2014/10/17 17:57:59]

Do you ever intend to implement these? If so then please include a reference to
the bug # for that work.

[kelvinp, 2014/10/20 00:21:16]

No plans for supporting multiple desktop on ChromeOS

[Wez, 2014/10/24 00:28:47]

OK; as discussed let's revert this and take the hit in the CreateVideoCapturer
API instead.

+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool AuraDesktopCapturer::SelectScreen(webrtc::ScreenId id) {
+  NOTIMPLEMENTED();
+  return false;
+};
+
 }  // namespace remoting
+
+namespace webrtc {

[Wez, 2014/10/17 17:57:59]

nit: Blank line between namespace and //static lines.

[kelvinp, 2014/10/20 00:21:16]

Done.

+// static
+ScreenCapturer* ScreenCapturer::Create(const DesktopCaptureOptions& options) {
+  return new remoting::AuraDesktopCapturer();
+}
+
+}  // namespace webrtc