Index: chrome/browser/media/desktop_media_list_base.h |
diff --git a/chrome/browser/media/desktop_media_list_base.h b/chrome/browser/media/desktop_media_list_base.h |
index 6c0feb11373953c5edf66a070203145349b4ed34..41469678ebfbe1729187e7258bfc2c16f26413d7 100644 |
--- a/chrome/browser/media/desktop_media_list_base.h |
+++ b/chrome/browser/media/desktop_media_list_base.h |
@@ -7,6 +7,9 @@ |
#include "chrome/browser/media/desktop_media_list.h" |
#include "content/public/browser/desktop_media_id.h" |
+#include "ui/gfx/image/image.h" |
+ |
+using content::DesktopMediaID; |
Sergey Ulanov
2016/03/10 00:46:07
using is not allowed in headers. Please use fully
GeorgeZ
2016/03/10 21:18:46
Done.
|
// Thumbnail size is 100*100 pixels |
static const int kDefaultThumbnailSize = 100; |
@@ -22,16 +25,18 @@ class DesktopMediaListBase : public DesktopMediaList { |
// DesktopMediaList interface. |
void SetUpdatePeriod(base::TimeDelta period) override; |
void SetThumbnailSize(const gfx::Size& thumbnail_size) override; |
- void SetViewDialogWindowId(content::DesktopMediaID dialog_id) override; |
+ void SetViewDialogWindowId(DesktopMediaID dialog_id) override; |
void StartUpdating(DesktopMediaListObserver* observer) override; |
int GetSourceCount() const override; |
const Source& GetSource(int index) const override; |
+ static uint32_t GetImageHash(const gfx::Image& image); |
+ |
protected: |
struct SourceDescription { |
- SourceDescription(content::DesktopMediaID id, const base::string16& name); |
+ SourceDescription(DesktopMediaID id, const base::string16& name); |
- content::DesktopMediaID id; |
+ DesktopMediaID id; |
base::string16 name; |
}; |
@@ -41,8 +46,7 @@ class DesktopMediaListBase : public DesktopMediaList { |
void UpdateSourcesList(const std::vector<SourceDescription>& new_sources); |
// Update a thumbnail to observer. |
- void UpdateSourceThumbnail(content::DesktopMediaID id, |
- const gfx::ImageSkia& image); |
+ void UpdateSourceThumbnail(DesktopMediaID id, const gfx::ImageSkia& image); |
// Post a task for next list update. |
void ScheduleNextRefresh(); |
@@ -52,8 +56,8 @@ class DesktopMediaListBase : public DesktopMediaList { |
gfx::Size(kDefaultThumbnailSize, kDefaultThumbnailSize); |
// ID of the hosting dialog. |
- content::DesktopMediaID view_dialog_id_ = |
- content::DesktopMediaID(content::DesktopMediaID::TYPE_NONE, -1); |
+ DesktopMediaID view_dialog_id_ = |
+ DesktopMediaID(DesktopMediaID::TYPE_NONE, -1); |
private: |
// Time interval between mode updates. |