win/aura: Remove some more non-aura code for Windows.

chrome/browser/password_manager/password_manager_util_win.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.
 
 // windows.h must be first otherwise Win8 SDK breaks.
 #include <windows.h>
 #include <LM.h>
 #include <wincred.h>
 
 // SECURITY_WIN32 must be defined in order to get
@@ skipping 10 matching lines @@
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "ui/base/l10n/l10n_util.h"
-
-#if defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
-#endif
+#include "ui/base/l10n/l10n_util.h"
 
 namespace password_manager_util {
 namespace {
 
 const unsigned kMaxPasswordRetries = 3;
 
 const unsigned kCredUiDefaultFlags =
     CREDUI_FLAGS_GENERIC_CREDENTIALS |
     CREDUI_FLAGS_EXCLUDE_CERTIFICATES |
     CREDUI_FLAGS_KEEP_USERNAME |
@@ skipping 194 matching lines @@
     }
   }
 
   // Try and obtain a friendly display name.
   username_length = CREDUI_MAX_USERNAME_LENGTH;
   if (GetUserNameEx(NameDisplay, displayname, &username_length))
     use_displayname = true;
 
   cui.cbSize = sizeof(CREDUI_INFO);
   cui.hwndParent = NULL;
-#if defined(USE_AURA)
   cui.hwndParent = window->GetHost()->GetAcceleratedWidget();
-#else
-  cui.hwndParent = window;
-#endif
 
   cui.pszMessageText = password_prompt.c_str();
   cui.pszCaptionText = product_name.c_str();
 
   cui.hbmBanner = NULL;
   BOOL save_password = FALSE;
   DWORD credErr = NO_ERROR;
 
   do {
     tries++;
@@ skipping 32 matching lines @@
         }
       }
       SecureZeroMemory(password, sizeof(password));
     }
   } while (credErr == NO_ERROR &&
            (retval == false && tries < kMaxPasswordRetries));
   return retval;
 }
 
 }  // namespace password_manager_util