Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
index 049a56b160d31a5e43666ae27df96f09b104d758..f6ecd5986f05c8e2a69425fbe67cd842ff600ce6 100644 |
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc |
@@ -17,6 +17,8 @@ |
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" |
#include "chrome/browser/media/webrtc/native_desktop_media_list.h" |
#include "chrome/browser/media/webrtc/tab_desktop_media_list.h" |
+#include "chrome/browser/ui/browser_finder.h" |
+#include "chrome/browser/ui/browser_window.h" |
#include "components/version_info/version_info.h" |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/render_process_host.h" |
@@ -116,8 +118,13 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute( |
return false; |
} |
- const gfx::NativeWindow parent_window = |
- web_contents->GetTopLevelNativeWindow(); |
+ gfx::NativeWindow parent_window = web_contents->GetTopLevelNativeWindow(); |
+ if (!parent_window) { |
Sergey Ulanov
2016/10/26 17:08:08
Please add a comment here to explain why we need t
qiangchen
2016/10/26 18:39:17
Done.
|
+ Browser* target_browser = chrome::FindLastActive(); |
Sergey Ulanov
2016/10/26 17:08:08
I think it's best to use chrome::FindLastActiveWit
qiangchen
2016/10/26 18:39:17
Done.
|
+ |
+ if (target_browser) |
+ parent_window = target_browser->window()->GetNativeWindow(); |
+ } |
std::unique_ptr<DesktopMediaList> screen_list; |
std::unique_ptr<DesktopMediaList> window_list; |
std::unique_ptr<DesktopMediaList> tab_list; |