chrome/browser/media/webrtc/native_desktop_media_list.h - 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.h

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/media_stream_infobar_delegate_android.cc ('k') | chrome/browser/media/webrtc/native_desktop_media_list.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 #ifndef CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_	5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_NATIVE_DESKTOP_MEDIA_LIST_H_

6 #define CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_	6 #define CHROME_BROWSER_MEDIA_WEBRTC_NATIVE_DESKTOP_MEDIA_LIST_H_

7	7

8 #include <memory>	8 #include <memory>

9	9

10 #include "base/memory/weak_ptr.h"	10 #include "base/memory/weak_ptr.h"

11 #include "base/sequenced_task_runner.h"	11 #include "base/sequenced_task_runner.h"

12 #include "chrome/browser/media/desktop_media_list_base.h"	12 #include "chrome/browser/media/webrtc/desktop_media_list_base.h"

13 #include "content/public/browser/desktop_media_id.h"	13 #include "content/public/browser/desktop_media_id.h"

14 #include "ui/gfx/image/image.h"	14 #include "ui/gfx/image/image.h"

15	15

16 namespace webrtc {	16 namespace webrtc {

17 class ScreenCapturer;	17 class ScreenCapturer;

18 class WindowCapturer;	18 class WindowCapturer;

19 }	19 }

20	20

21 // Implementation of DesktopMediaList that shows native screens and	21 // Implementation of DesktopMediaList that shows native screens and

22 // native windows.	22 // native windows.

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 ImageHashesMap new_aura_thumbnail_hashes_;	66 ImageHashesMap new_aura_thumbnail_hashes_;

67	67

68 int pending_aura_capture_requests_ = 0;	68 int pending_aura_capture_requests_ = 0;

69 bool pending_native_thumbnail_capture_ = false;	69 bool pending_native_thumbnail_capture_ = false;

70 #endif	70 #endif

71 base::WeakPtrFactory<NativeDesktopMediaList> weak_factory_;	71 base::WeakPtrFactory<NativeDesktopMediaList> weak_factory_;

72	72

73 DISALLOW_COPY_AND_ASSIGN(NativeDesktopMediaList);	73 DISALLOW_COPY_AND_ASSIGN(NativeDesktopMediaList);

74 };	74 };

75	75

76 #endif // CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_	76 #endif // CHROME_BROWSER_MEDIA_WEBRTC_NATIVE_DESKTOP_MEDIA_LIST_H_

OLD	NEW