chrome/browser/media/webrtc/native_desktop_media_list.cc - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/media/webrtc/native_desktop_media_list.cc

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 months ago

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

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/media/webrtc/native_desktop_media_list.h ('k') | chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/media/native_desktop_media_list.h"	5 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"

6	6

7 #include "base/hash.h"	7 #include "base/hash.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "base/threading/sequenced_worker_pool.h"	9 #include "base/threading/sequenced_worker_pool.h"

10 #include "chrome/browser/media/desktop_media_list_observer.h"	10 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"

11 #include "chrome/grit/generated_resources.h"	11 #include "chrome/grit/generated_resources.h"

12 #include "content/public/browser/browser_thread.h"	12 #include "content/public/browser/browser_thread.h"

13 #include "media/base/video_util.h"	13 #include "media/base/video_util.h"

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

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

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

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

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

19 #include "ui/aura/window.h"	19 #include "ui/aura/window.h"

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

(...skipping 346 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
367 if (pending_aura_capture_requests_ == 0) {	367 if (pending_aura_capture_requests_ == 0) {

368 previous_aura_thumbnail_hashes_ = std::move(new_aura_thumbnail_hashes_);	368 previous_aura_thumbnail_hashes_ = std::move(new_aura_thumbnail_hashes_);

369 // Schedule next refresh if aura thumbnail captures finished after native	369 // Schedule next refresh if aura thumbnail captures finished after native

370 // thumbnail captures.	370 // thumbnail captures.

371 if (!pending_native_thumbnail_capture_)	371 if (!pending_native_thumbnail_capture_)

372 ScheduleNextRefresh();	372 ScheduleNextRefresh();

373 }	373 }

374 }	374 }

375	375

376 #endif // defined(USE_AURA)	376 #endif // defined(USE_AURA)

OLD	NEW