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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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_DESKTOP_MEDIA_LIST_BASE_H_	5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_

6 #define CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_BASE_H_	6 #define CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_

7	7

8 #include "chrome/browser/media/desktop_media_list.h"	8 #include "chrome/browser/media/webrtc/desktop_media_list.h"

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

10	10

11 namespace gfx {	11 namespace gfx {

12 class Image;	12 class Image;

13 }	13 }

14	14

15 // Thumbnail size is 100*100 pixels	15 // Thumbnail size is 100*100 pixels

16 static const int kDefaultThumbnailSize = 100;	16 static const int kDefaultThumbnailSize = 100;

17	17

18 // Base class for DesktopMediaList implementations. Implements logic shared	18 // Base class for DesktopMediaList implementations. Implements logic shared

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 std::vector<Source> sources_;	69 std::vector<Source> sources_;

70	70

71 // The observer passed to StartUpdating().	71 // The observer passed to StartUpdating().

72 DesktopMediaListObserver* observer_ = nullptr;	72 DesktopMediaListObserver* observer_ = nullptr;

73	73

74 base::WeakPtrFactory<DesktopMediaListBase> weak_factory_;	74 base::WeakPtrFactory<DesktopMediaListBase> weak_factory_;

75	75

76 DISALLOW_COPY_AND_ASSIGN(DesktopMediaListBase);	76 DISALLOW_COPY_AND_ASSIGN(DesktopMediaListBase);

77 };	77 };

78	78

79 #endif // CHROME_BROWSER_MEDIA_DESKTOP_MEDIA_LIST_BASE_H_	79 #endif // CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_

OLD	NEW