| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h" | 5 #include "chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "chrome/browser/media/webrtc/desktop_media_list.h" | 8 #include "chrome/browser/media/webrtc/desktop_media_list.h" |
| 9 #include "chrome/browser/ui/browser_dialogs.h" |
| 9 #include "chrome/browser/ui/browser_finder.h" | 10 #include "chrome/browser/ui/browser_finder.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 11 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h" | 12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h" |
| 12 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h" | 13 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h" |
| 13 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h" | 14 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h" |
| 14 #include "chrome/grit/chromium_strings.h" | 15 #include "chrome/grit/chromium_strings.h" |
| 15 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
| 16 #include "components/constrained_window/constrained_window_views.h" | 17 #include "components/constrained_window/constrained_window_views.h" |
| 17 #include "components/strings/grit/components_strings.h" | 18 #include "components/strings/grit/components_strings.h" |
| 18 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 19 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 bool modal_dialog = | 211 bool modal_dialog = |
| 211 parent_web_contents && | 212 parent_web_contents && |
| 212 !parent_web_contents->GetDelegate()->IsNeverVisible(parent_web_contents); | 213 !parent_web_contents->GetDelegate()->IsNeverVisible(parent_web_contents); |
| 213 if (modal_dialog) { | 214 if (modal_dialog) { |
| 214 widget = | 215 widget = |
| 215 constrained_window::ShowWebModalDialogViews(this, parent_web_contents); | 216 constrained_window::ShowWebModalDialogViews(this, parent_web_contents); |
| 216 } else { | 217 } else { |
| 217 widget = DialogDelegate::CreateDialogWidget(this, context, nullptr); | 218 widget = DialogDelegate::CreateDialogWidget(this, context, nullptr); |
| 218 widget->Show(); | 219 widget->Show(); |
| 219 } | 220 } |
| 221 chrome::RecordDialogCreation(chrome::DialogIdentifier::DESKTOP_MEDIA_PICKER); |
| 220 | 222 |
| 221 // If the picker is not modal to the calling web contents then it is displayed | 223 // If the picker is not modal to the calling web contents then it is displayed |
| 222 // in its own top-level window, so in that case it needs to be filtered out of | 224 // in its own top-level window, so in that case it needs to be filtered out of |
| 223 // the list of top-level windows available for capture, and to achieve that | 225 // the list of top-level windows available for capture, and to achieve that |
| 224 // the Id is passed to DesktopMediaList. | 226 // the Id is passed to DesktopMediaList. |
| 225 DesktopMediaID dialog_window_id; | 227 DesktopMediaID dialog_window_id; |
| 226 if (!modal_dialog) { | 228 if (!modal_dialog) { |
| 227 dialog_window_id = DesktopMediaID::RegisterAuraWindow( | 229 dialog_window_id = DesktopMediaID::RegisterAuraWindow( |
| 228 DesktopMediaID::TYPE_WINDOW, widget->GetNativeWindow()); | 230 DesktopMediaID::TYPE_WINDOW, widget->GetNativeWindow()); |
| 229 | 231 |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 // DesktopMediaPicker. | 449 // DesktopMediaPicker. |
| 448 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, | 450 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, |
| 449 base::Bind(callback_, source)); | 451 base::Bind(callback_, source)); |
| 450 callback_.Reset(); | 452 callback_.Reset(); |
| 451 } | 453 } |
| 452 | 454 |
| 453 // static | 455 // static |
| 454 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { | 456 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { |
| 455 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); | 457 return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews()); |
| 456 } | 458 } |
| OLD | NEW |