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

Side by Side Diff: chrome/browser/media/native_desktop_media_list.h

Issue 100743003: Extend content::DesktopMediaID to allow Aura windows as capture sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
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_NATIVE_DESKTOP_MEDIA_LIST_H_
6 #define CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_ 6 #define CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
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.h" 12 #include "chrome/browser/media/desktop_media_list.h"
13 #include "content/public/common/desktop_media_id.h" 13 #include "content/public/browser/desktop_media_id.h"
14 #include "ui/gfx/image/image_skia.h" 14 #include "ui/gfx/image/image_skia.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.
23 class NativeDesktopMediaList : public DesktopMediaList { 23 class NativeDesktopMediaList : public DesktopMediaList {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 // Current list of sources. 93 // Current list of sources.
94 std::vector<Source> sources_; 94 std::vector<Source> sources_;
95 95
96 base::WeakPtrFactory<NativeDesktopMediaList> weak_factory_; 96 base::WeakPtrFactory<NativeDesktopMediaList> weak_factory_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(NativeDesktopMediaList); 98 DISALLOW_COPY_AND_ASSIGN(NativeDesktopMediaList);
99 }; 99 };
100 100
101 #endif // CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_ 101 #endif // CHROME_BROWSER_MEDIA_NATIVE_DESKTOP_MEDIA_LIST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698