Reverting since merge is breaking build.

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 "chrome/browser/media/desktop_media_list_observer.h"
 #include "chrome/browser/media/desktop_media_picker.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 90 matching lines @@
   bool selected_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopMediaSourceView);
 };
 
 // Dialog view used for DesktopMediaPickerViews.
 class DesktopMediaPickerDialogView : public views::DialogDelegateView {
  public:
   DesktopMediaPickerDialogView(content::WebContents* parent_web_contents,
                                gfx::NativeWindow context,
+                               gfx::NativeWindow parent_window,
                                DesktopMediaPickerViews* parent,
                                const base::string16& app_name,
                                const base::string16& target_name,
                                scoped_ptr<DesktopMediaList> media_list);
   virtual ~DesktopMediaPickerDialogView();
 
   // Called by parent (DesktopMediaPickerViews) when it's destroyed.
   void DetachParent();
 
   // Called by DesktopMediaListView.
@@ skipping 54 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_