Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(964)

Side by Side Diff: chrome/browser/media/combined_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
OLDNEW
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_COMBINED_DESKTOP_MEDIA_LIST_H_ 5 #ifndef CHROME_BROWSER_MEDIA_COMBINED_DESKTOP_MEDIA_LIST_H_
6 #define CHROME_BROWSER_MEDIA_COMBINED_DESKTOP_MEDIA_LIST_H_ 6 #define CHROME_BROWSER_MEDIA_COMBINED_DESKTOP_MEDIA_LIST_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "chrome/browser/media/desktop_media_list.h" 11 #include "chrome/browser/media/webrtc/desktop_media_list.h"
12 #include "chrome/browser/media/desktop_media_list_observer.h" 12 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
13 13
14 // The combined desktop media list of one or multiple input DesktopMediaLists. 14 // The combined desktop media list of one or multiple input DesktopMediaLists.
15 // The combined list is the concatenation of the input lists. The front of 15 // The combined list is the concatenation of the input lists. The front of
16 // combined list will be filled with the first input list, then follows with 16 // combined list will be filled with the first input list, then follows with
17 // the second one and so on. 17 // the second one and so on.
18 class CombinedDesktopMediaList : public DesktopMediaList, 18 class CombinedDesktopMediaList : public DesktopMediaList,
19 public DesktopMediaListObserver { 19 public DesktopMediaListObserver {
20 public: 20 public:
21 explicit CombinedDesktopMediaList( 21 explicit CombinedDesktopMediaList(
22 std::vector<std::unique_ptr<DesktopMediaList>>& media_lists); 22 std::vector<std::unique_ptr<DesktopMediaList>>& media_lists);
(...skipping 18 matching lines...) Expand all
41 void OnSourceThumbnailChanged(DesktopMediaList* list, int index) override; 41 void OnSourceThumbnailChanged(DesktopMediaList* list, int index) override;
42 42
43 std::vector<std::unique_ptr<DesktopMediaList>> media_lists_; 43 std::vector<std::unique_ptr<DesktopMediaList>> media_lists_;
44 44
45 DesktopMediaListObserver* observer_ = nullptr; 45 DesktopMediaListObserver* observer_ = nullptr;
46 46
47 DISALLOW_COPY_AND_ASSIGN(CombinedDesktopMediaList); 47 DISALLOW_COPY_AND_ASSIGN(CombinedDesktopMediaList);
48 }; 48 };
49 49
50 #endif // CHROME_BROWSER_MEDIA_COMBINED_DESKTOP_MEDIA_LIST_H_ 50 #endif // CHROME_BROWSER_MEDIA_COMBINED_DESKTOP_MEDIA_LIST_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/capture_access_handler_base.cc ('k') | chrome/browser/media/combined_desktop_media_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698