Cleanup DesktopMediaPicker

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

 // Copyright 2013 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.
 
 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 146 matching lines @@
         error_ = kTabCaptureNotSupportedError;
         return false;
     }
   }
 
   if (!show_screens && !show_windows) {
     error_ = kEmptySourcesListError;
     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(
         show_screens, show_windows);
     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)));
     } else
 #endif
     {
       webrtc::DesktopCaptureOptions options =
           webrtc::DesktopCaptureOptions::CreateDefault();
       options.set_disable_effects(false);
       scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
@@ skipping 11 matching lines @@
     picker_ = DesktopMediaPicker::Create();
 #else
     error_ = "Desktop Capture API is not yet implemented for this platform.";
     return false;
 #endif
   }
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this);
 
   picker_->Show(web_contents,
-                parent_window,
-                parent_window,
                 base::UTF8ToUTF16(extension()->name()),
                 target_name,
                 media_list.Pass(),
                 callback);
   return true;
 }
 
 void DesktopCaptureChooseDesktopMediaFunction::WebContentsDestroyed() {
   Cancel();
 }
@@ skipping 76 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions