| 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..af1fcab2c81178f53a441360dd12537d30bc2626 100644
|
| --- a/chrome/browser/media/desktop_media_list_ash.h
|
| +++ b/chrome/browser/media/desktop_media_list_ash.h
|
| @@ -31,11 +31,7 @@ class Image;
|
| // native windows.
|
| class DesktopMediaListAsh : public DesktopMediaList {
|
| public:
|
| - enum SourceTypes {
|
| - SCREENS = 1,
|
| - WINDOWS = 2,
|
| - };
|
| -
|
| + enum SourceTypes { SCREENS = 1, WINDOWS = 2, TABS = 4 };
|
| explicit DesktopMediaListAsh(int source_types);
|
| ~DesktopMediaListAsh() override;
|
|
|
| @@ -51,9 +47,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 +63,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);
|
|
|