| Index: chrome/browser/media/desktop_media_list_base.cc
|
| diff --git a/chrome/browser/media/desktop_media_list_base.cc b/chrome/browser/media/desktop_media_list_base.cc
|
| index b4c9c2f1237dddcfea382e3f61379eb39627f22b..1a12879e842be26847c875449dc2c5ba333cf90a 100644
|
| --- a/chrome/browser/media/desktop_media_list_base.cc
|
| +++ b/chrome/browser/media/desktop_media_list_base.cc
|
| @@ -25,8 +25,7 @@ void DesktopMediaListBase::SetThumbnailSize(const gfx::Size& thumbnail_size) {
|
| thumbnail_size_ = thumbnail_size;
|
| }
|
|
|
| -void DesktopMediaListBase::SetViewDialogWindowId(
|
| - content::DesktopMediaID dialog_id) {
|
| +void DesktopMediaListBase::SetViewDialogWindowId(DesktopMediaID dialog_id) {
|
| view_dialog_id_ = dialog_id;
|
| }
|
|
|
| @@ -49,13 +48,13 @@ const DesktopMediaList::Source& DesktopMediaListBase::GetSource(
|
| }
|
|
|
| DesktopMediaListBase::SourceDescription::SourceDescription(
|
| - content::DesktopMediaID id,
|
| + DesktopMediaID id,
|
| const base::string16& name)
|
| : id(id), name(name) {}
|
|
|
| void DesktopMediaListBase::UpdateSourcesList(
|
| const std::vector<SourceDescription>& new_sources) {
|
| - typedef std::set<content::DesktopMediaID> SourceSet;
|
| + typedef std::set<DesktopMediaID> SourceSet;
|
| SourceSet new_source_set;
|
| for (size_t i = 0; i < new_sources.size(); ++i) {
|
| new_source_set.insert(new_sources[i].id);
|
| @@ -115,7 +114,7 @@ void DesktopMediaListBase::UpdateSourcesList(
|
| }
|
| }
|
|
|
| -void DesktopMediaListBase::UpdateSourceThumbnail(content::DesktopMediaID id,
|
| +void DesktopMediaListBase::UpdateSourceThumbnail(DesktopMediaID id,
|
| const gfx::ImageSkia& image) {
|
| for (size_t i = 0; i < sources_.size(); ++i) {
|
| if (sources_[i].id == id) {
|
| @@ -132,3 +131,14 @@ void DesktopMediaListBase::ScheduleNextRefresh() {
|
| base::Bind(&DesktopMediaListBase::Refresh, weak_factory_.GetWeakPtr()),
|
| update_period_);
|
| }
|
| +
|
| +// Static
|
| +uint32_t DesktopMediaListBase::GetImageHash(const gfx::Image& image) {
|
| + SkBitmap bitmap = image.AsBitmap();
|
| + bitmap.lockPixels();
|
| + uint32_t value =
|
| + base::Hash(reinterpret_cast<char*>(bitmap.getPixels()), bitmap.getSize());
|
| + bitmap.unlockPixels();
|
| +
|
| + return value;
|
| +}
|
|
|