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

Unified Diff: chrome/browser/media/native_desktop_media_list.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/native_desktop_media_list.cc
diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc
index 0c4d2108fd03945558049b451f9fa3e8c419f90f..9b1ef6f4bebc6af65552b09cde055fafaf5c525e 100644
--- a/chrome/browser/media/native_desktop_media_list.cc
+++ b/chrome/browser/media/native_desktop_media_list.cc
@@ -307,7 +307,7 @@ void NativeDesktopMediaList::OnSourcesList(
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;
}
}
@@ -323,7 +323,7 @@ void NativeDesktopMediaList::OnSourcesList(
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);
}
}
}
@@ -347,12 +347,12 @@ void NativeDesktopMediaList::OnSourcesList(
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;
}
@@ -363,7 +363,7 @@ void NativeDesktopMediaList::OnSourceThumbnail(
const gfx::ImageSkia& image) {
DCHECK_LT(index, static_cast<int>(sources_.size()));
sources_[index].thumbnail = image;
- observer_->OnSourceThumbnailChanged(index);
+ observer_->OnSourceThumbnailChanged(this, index);
}
void NativeDesktopMediaList::OnRefreshFinished() {
« no previous file with comments | « chrome/browser/media/desktop_media_list_observer.h ('k') | chrome/browser/ui/views/desktop_media_picker_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698