Cleanup DesktopMediaPicker

chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
index db51a8810aeaec342c0ade3113ee4c0d8b5cfb66..220a53b2d9d43c0ac5f543f9d15d2063605acb2b 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
@@ -164,8 +164,6 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunAsync() {
     return false;
   }
 
-  const gfx::NativeWindow parent_window =
-      web_contents->GetTopLevelNativeWindow();
   scoped_ptr<DesktopMediaList> media_list;
   if (g_picker_factory) {
     media_list = g_picker_factory->CreateModel(
@@ -173,7 +171,7 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunAsync() {
     picker_ = g_picker_factory->CreatePicker();
   } else {
 #if defined(USE_ASH)
-    if (chrome::IsNativeWindowInAsh(parent_window)) {
+    if (chrome::IsNativeWindowInAsh(web_contents->GetTopLevelNativeWindow())) {
       media_list.reset(new DesktopMediaListAsh(
           (show_screens ? DesktopMediaListAsh::SCREENS : 0) |
           (show_windows ? DesktopMediaListAsh::WINDOWS : 0)));
@@ -205,8 +203,6 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunAsync() {
       &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this);
 
   picker_->Show(web_contents,
-                parent_window,
-                parent_window,
                 base::UTF8ToUTF16(extension()->name()),
                 target_name,
                 media_list.Pass(),