Remove more non-aura windows code.

content/shell/browser/shell_download_manager_delegate.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 "content/shell/browser/shell_download_manager_delegate.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 10 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/browser/webkit_test_controller.h"
 #include "content/shell/common/shell_switches.h"
 #include "net/base/net_util.h"
 
+#if defined(OS_WIN)
+#include "ui/aura/root_window.h"
+#include "ui/aura/window.h"
+#endif
+
 namespace content {
 
 ShellDownloadManagerDelegate::ShellDownloadManagerDelegate()
     : download_manager_(NULL),
       suppress_prompting_(false),
       weak_ptr_factory_(this) {}
 
 ShellDownloadManagerDelegate::~ShellDownloadManagerDelegate(){
   if (download_manager_) {
     DCHECK_EQ(static_cast<DownloadManagerDelegate*>(this),
@@ skipping 115 matching lines @@
 void ShellDownloadManagerDelegate::ChooseDownloadPath(
     uint32 download_id,
     const DownloadTargetCallback& callback,
     const base::FilePath& suggested_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadItem* item = download_manager_->GetDownload(download_id);
   if (!item || (item->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   base::FilePath result;
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)

[scottmg, 2014/01/14 21:12:37]

did you mean to remove this? if not, it might still be better to try to keep the
huge delete CLs to no-ops.

[jam, 2014/01/14 21:54:32]

yep i meant to remove it since we should have implemented this for aura

[scottmg, 2014/01/14 22:00:24]

ok

   std::wstring file_part = base::FilePath(suggested_path).BaseName().value();
   wchar_t file_name[MAX_PATH];
   base::wcslcpy(file_name, file_part.c_str(), arraysize(file_name));
   OPENFILENAME save_as;
   ZeroMemory(&save_as, sizeof(save_as));
   save_as.lStructSize = sizeof(OPENFILENAME);
-  save_as.hwndOwner = item->GetWebContents()->GetView()->GetNativeView();
+  save_as.hwndOwner = item->GetWebContents()->GetView()->GetNativeView()->
+      GetDispatcher()->host()->GetAcceleratedWidget();
   save_as.lpstrFile = file_name;
   save_as.nMaxFile = arraysize(file_name);
 
   std::wstring directory;
   if (!suggested_path.empty())
     directory = suggested_path.DirName().value();
 
   save_as.lpstrInitialDir = directory.c_str();
   save_as.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER | OFN_ENABLESIZING |
                   OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST;
@@ skipping 32 matching lines @@
                DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, result);
 }
 
 void ShellDownloadManagerDelegate::SetDownloadBehaviorForTesting(
     const base::FilePath& default_download_path) {
   default_download_path_ = default_download_path;
   suppress_prompting_ = true;
 }
 
 }  // namespace content