Index: chrome/browser/ui/views/desktop_media_picker_views.cc |
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc |
index 9b1f2f18d16abd17d6f372111deb483970c6fc10..6fad249bc487ab32c875fff5cb448040c14d71ea 100644 |
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc |
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc |
@@ -546,23 +546,9 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView( |
else |
widget = DialogDelegate::CreateDialogWidget(this, context, parent_window); |
- // DesktopMediaList needs to know the ID of the picker window which |
- // matches the ID it gets from the OS. Depending on the OS and configuration |
- // we get this ID differently. |
- content::DesktopMediaID::Id dialog_window_id = 0; |
-#if defined(USE_ASH) |
- if (chrome::IsNativeWindowInAsh(widget->GetNativeWindow())) { |
- dialog_window_id = content::DesktopMediaID::RegisterAuraWindow( |
- widget->GetNativeWindow()).id; |
- DCHECK_NE(dialog_window_id, 0); |
- } |
-#endif |
- if (dialog_window_id == 0) { |
- dialog_window_id = AcceleratedWidgetToDesktopMediaId( |
- widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget()); |
- } |
- |
- list_view_->StartUpdating(dialog_window_id); |
+ // The picker window is embedded in the parent window and does not have its |
+ // own native window with Aura. So we do not filter any window. |
Sergey Ulanov
2014/06/13 17:38:41
Actually it's not always the case. We still have a
jiayl
2014/06/13 17:54:54
But I tested both the desktopCapture example exten
|
+ list_view_->StartUpdating(0); |
if (parent_web_contents) { |
web_modal::WebContentsModalDialogManager* manager = |