Add CombinedDesktopMediaList class

chrome/browser/ui/views/desktop_media_picker_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/desktop_media_picker_views.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 293 matching lines @@
     if (new_selected) {
       GetFocusManager()->SetFocusedView(new_selected);
     }
 
     return true;
   }
 
   return false;
 }
 
-void DesktopMediaListView::OnSourceAdded(int index) {
+void DesktopMediaListView::OnSourceAdded(DesktopMediaList* list, int index) {
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   DesktopMediaSourceView* source_view =
       new DesktopMediaSourceView(this, source.id);
   source_view->SetName(source.name);
   source_view->SetGroup(kDesktopMediaSourceViewGroupId);
   AddChildViewAt(source_view, index);
 
   PreferredSizeChanged();
 
   if (child_count() % kListColumns == 1)
     parent_->OnMediaListRowsChanged();
 
   std::string autoselect_source =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kAutoSelectDesktopCaptureSource);
   if (!autoselect_source.empty() &&
       base::ASCIIToUTF16(autoselect_source) == source.name) {
     // Select, then accept and close the dialog when we're done adding sources.
     source_view->OnFocus();
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(&DesktopMediaListView::AcceptSelection,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
-void DesktopMediaListView::OnSourceRemoved(int index) {
+void DesktopMediaListView::OnSourceRemoved(DesktopMediaList* list, int index) {
   DesktopMediaSourceView* view =
       static_cast<DesktopMediaSourceView*>(child_at(index));
   DCHECK(view);
   DCHECK_EQ(view->GetClassName(), kDesktopMediaSourceViewClassName);
   bool was_selected = view->is_selected();
   RemoveChildView(view);
   delete view;
 
   if (was_selected)
     OnSelectionChanged();
 
   PreferredSizeChanged();
 
   if (child_count() % kListColumns == 0)
     parent_->OnMediaListRowsChanged();
 }
 
-void DesktopMediaListView::OnSourceMoved(int old_index, int new_index) {
+void DesktopMediaListView::OnSourceMoved(DesktopMediaList* list,
+                                         int old_index,
+                                         int new_index) {
   DesktopMediaSourceView* view =
       static_cast<DesktopMediaSourceView*>(child_at(old_index));
   ReorderChildView(view, new_index);
   PreferredSizeChanged();
 }
 
-void DesktopMediaListView::OnSourceNameChanged(int index) {
+void DesktopMediaListView::OnSourceNameChanged(DesktopMediaList* list,
+                                               int index) {
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   DesktopMediaSourceView* source_view =
       static_cast<DesktopMediaSourceView*>(child_at(index));
   source_view->SetName(source.name);
 }
 
-void DesktopMediaListView::OnSourceThumbnailChanged(int index) {
+void DesktopMediaListView::OnSourceThumbnailChanged(DesktopMediaList* list,
+                                                    int index) {
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   DesktopMediaSourceView* source_view =
       static_cast<DesktopMediaSourceView*>(child_at(index));
   source_view->SetThumbnail(source.thumbnail);
 }
 
 void DesktopMediaListView::AcceptSelection() {
   OnSelectionChanged();
   OnDoubleClick();
 }
@@ skipping 215 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }