chrome/browser/media/webrtc/native_desktop_media_list.cc - Issue 2495453002: [Chromoting] Remove screen_capturer.h & desktop_capturer.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/webrtc/native_desktop_media_list.cc

Issue 2495453002: [Chromoting] Remove screen_capturer.h & desktop_capturer.h (Closed)

Patch Set: Include ipc_desktop_environment_unittest.cc Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/media/webrtc/native_desktop_media_list.cc

diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc

index eb95dad40f8ff747af5a5f8bc9dfb1be1c27135d..7db6e322ad29d53c8951b99fb5d9b71c147a5eb6 100644

--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc

+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc

@@ -13,9 +13,8 @@

#include "media/base/video_util.h"

#include "third_party/libyuv/include/libyuv/scale_argb.h"

#include "third_party/skia/include/core/SkBitmap.h"

+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"

#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"

-#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"

-#include "third_party/webrtc/modules/desktop_capture/window_capturer.h"

#include "ui/aura/window.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/snapshot/snapshot.h"