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

chrome/browser/ui/toolbar/wrench_menu_model.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/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 507 matching lines @@
   AddSeparator();
 
   if (browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
     const string16 short_product_name =
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
     AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
         IDS_SHOW_SYNC_SETUP, short_product_name));
     AddSeparator();
   }
 
-#if defined(OS_MACOSX)
+#if defined(USE_AURA)
+#if defined(OS_WIN)
+  AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
+#else
   AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
-#elif defined(USE_AURA)
+#endif
+#elif defined(OS_MACOSX)
   AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
 #elif defined(TOOLKIT_USES_GTK)
   string16 preferences = gtk_util::GetStockPreferencesMenuLabel();
   if (!preferences.empty())
     AddItem(IDC_OPTIONS, preferences);
   else
     AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
 #else
   AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #endif
@@ skipping 74 matching lines @@
         &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }