Add CombinedDesktopMediaList.

chrome/browser/ui/views/desktop_media_picker_views.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_
 
 #include "base/macros.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
 #include "chrome/browser/media/desktop_media_picker.h"
@@ skipping 28 matching lines @@
   // Returns currently selected source.
   DesktopMediaSourceView* GetSelection();
 
   // views::View overrides.
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
 
  private:
   // DesktopMediaList::Observer interface
-  void OnSourceAdded(int index) override;
-  void OnSourceRemoved(int index) override;
-  void OnSourceMoved(int old_index, int new_index) override;
-  void OnSourceNameChanged(int index) override;
-  void OnSourceThumbnailChanged(int index) override;
+  void OnSourceAdded(DesktopMediaList* list, int index) override;
+  void OnSourceRemoved(DesktopMediaList* list, int index) override;
+  void OnSourceMoved(DesktopMediaList* list,
+                     int old_index,
+                     int new_index) override;
+  void OnSourceNameChanged(DesktopMediaList* list, int index) override;
+  void OnSourceThumbnailChanged(DesktopMediaList* list, int index) override;
 
   // Accepts whatever happens to be selected right now.
   void AcceptSelection();
 
   DesktopMediaPickerDialogView* parent_;
   scoped_ptr<DesktopMediaList> media_list_;
   base::WeakPtrFactory<DesktopMediaListView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaListView);
 };
@@ skipping 117 matching lines @@
 
   // The |dialog_| is owned by the corresponding views::Widget instance.
   // When DesktopMediaPickerViews is destroyed the |dialog_| is destroyed
   // asynchronously by closing the widget.
   DesktopMediaPickerDialogView* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaPickerViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_