Index: chrome/browser/media/desktop_media_list_ash.h |
diff --git a/chrome/browser/media/desktop_media_list_ash.h b/chrome/browser/media/desktop_media_list_ash.h |
index cf8bfb197e44a3ab3301b116779453c4da54f4fe..ab19380b9f41e7790b5bd9908678a95cb0ac04a4 100644 |
--- a/chrome/browser/media/desktop_media_list_ash.h |
+++ b/chrome/browser/media/desktop_media_list_ash.h |
@@ -31,11 +31,6 @@ class Image; |
// native windows. |
class DesktopMediaListAsh : public DesktopMediaList { |
public: |
qiangchen
2015/12/07 22:45:56
Any reason to move SourceTypes to the parent class
GeorgeZ
2015/12/09 19:36:37
This definition once shared with a sibling class.
|
- enum SourceTypes { |
- SCREENS = 1, |
- WINDOWS = 2, |
- }; |
- |
explicit DesktopMediaListAsh(int source_types); |
~DesktopMediaListAsh() override; |
@@ -51,9 +46,11 @@ class DesktopMediaListAsh : public DesktopMediaList { |
// Struct used to represent sources list the model gets from the Worker. |
struct SourceDescription { |
SourceDescription(content::DesktopMediaID id, const base::string16& name); |
+ SourceDescription() = default; |
content::DesktopMediaID id; |
base::string16 name; |
+ gfx::ImageSkia thumbnail; |
}; |
// Order comparator for sources. Used to sort list of sources. |
@@ -65,6 +62,8 @@ class DesktopMediaListAsh : public DesktopMediaList { |
std::vector<DesktopMediaListAsh::SourceDescription>* windows, |
aura::Window* root_window, |
int container_id); |
+ void EnumerateTabs( |
+ std::vector<DesktopMediaListAsh::SourceDescription>* sources); |
void EnumerateSources( |
std::vector<DesktopMediaListAsh::SourceDescription>* windows); |
void CaptureThumbnail(content::DesktopMediaID id, aura::Window* window); |