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

Unified Diff: chrome/browser/media/desktop_media_list_ash.cc

Issue 1554243002: Add CombinedDesktopMediaList. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/desktop_media_list_ash.cc
diff --git a/chrome/browser/media/desktop_media_list_ash.cc b/chrome/browser/media/desktop_media_list_ash.cc
index a9ab1a4224b0d9c05d9e9ecf0fe2c367df90dc2b..25fb5737cc73ff0af1dcce5cc276288c048c7d6f 100644
--- a/chrome/browser/media/desktop_media_list_ash.cc
+++ b/chrome/browser/media/desktop_media_list_ash.cc
@@ -96,7 +96,7 @@ void DesktopMediaListAsh::Refresh() {
for (size_t i = 0; i < sources_.size(); ++i) {
if (new_source_set.find(sources_[i].id) == new_source_set.end()) {
sources_.erase(sources_.begin() + i);
- observer_->OnSourceRemoved(i);
+ observer_->OnSourceRemoved(this, i);
--i;
}
}
@@ -112,7 +112,7 @@ void DesktopMediaListAsh::Refresh() {
sources_.insert(sources_.begin() + i, Source());
sources_[i].id = new_sources[i].id;
sources_[i].name = new_sources[i].name;
- observer_->OnSourceAdded(i);
+ observer_->OnSourceAdded(this, i);
}
}
}
@@ -136,12 +136,12 @@ void DesktopMediaListAsh::Refresh() {
sources_.erase(sources_.begin() + old_pos);
sources_.insert(sources_.begin() + pos, temp);
- observer_->OnSourceMoved(old_pos, pos);
+ observer_->OnSourceMoved(this, old_pos, pos);
}
if (sources_[pos].name != new_sources[pos].name) {
sources_[pos].name = new_sources[pos].name;
- observer_->OnSourceNameChanged(pos);
+ observer_->OnSourceNameChanged(this, pos);
}
++pos;
}
@@ -236,7 +236,7 @@ void DesktopMediaListAsh::OnThumbnailCaptured(content::DesktopMediaID id,
for (size_t i = 0; i < sources_.size(); ++i) {
if (sources_[i].id == id) {
sources_[i].thumbnail = image.AsImageSkia();
- observer_->OnSourceThumbnailChanged(i);
+ observer_->OnSourceThumbnailChanged(this, i);
break;
}
}
« no previous file with comments | « chrome/browser/media/combined_desktop_media_list.cc ('k') | chrome/browser/media/desktop_media_list_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698