Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3535)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views_win.cc ('k') | chrome/browser/ui/views/dropdown_bar_host.cc » ('j') | chrome/browser/ui/views/dropdown_bar_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
===================================================================
--- chrome/browser/ui/toolbar/wrench_menu_model.cc (revision 104318)
+++ chrome/browser/ui/toolbar/wrench_menu_model.cc (working copy)
@@ -525,9 +525,13 @@
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();
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views_win.cc ('k') | chrome/browser/ui/views/dropdown_bar_host.cc » ('j') | chrome/browser/ui/views/dropdown_bar_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698