Get Chrome to build & link with USE_AURA on Windows again.

chrome/browser/chrome_browser_main_win.cc

 // Copyright (c) 2011 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/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 56 matching lines @@
 void WarnAboutMinimumSystemRequirements() {
   if (base::win::GetVersion() < base::win::VERSION_XP) {
     // Display a warning message if the user is running chrome on Windows 2000.
     const string16 text =
         l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP);
     const string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
     ui::MessageBox(NULL, text, caption, MB_OK | MB_ICONWARNING | MB_TOPMOST);
   }
 }
 
+#if !defined(USE_AURA)
 void ShowMissingLocaleMessageBox() {
   ui::MessageBox(NULL, ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
                  ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
                  MB_OK | MB_ICONERROR | MB_TOPMOST);
 }
+#endif
 
 void RecordBrowserStartupTime() {
   // Calculate the time that has elapsed from our own process creation.
   FILETIME creation_time = {};
   FILETIME ignore = {};
   ::GetProcessTimes(::GetCurrentProcess(), &creation_time, &ignore, &ignore,
       &ignore);
 
   RecordPreReadExperimentTime("Startup.BrowserMessageLoopStartTime",
       base::Time::Now() - base::Time::FromFileTime(creation_time));
@@ skipping 183 matching lines @@
     const MainFunctionParams& parameters)
     : ChromeBrowserMainParts(parameters) {
 }
 
 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() {
   if (!parameters().ui_task) {
     // Make sure that we know how to handle exceptions from the message loop.
     InitializeWindowProcExceptions();
   }
 }