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

Unified Diff: views/controls/menu/native_menu_win.cc

Issue 174591: Revert 20675 - Make native_menu_win be 'owner_drawn' when the UI font/size is... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/native_menu_win.cc
===================================================================
--- views/controls/menu/native_menu_win.cc (revision 24579)
+++ views/controls/menu/native_menu_win.cc (working copy)
@@ -302,7 +302,7 @@
NativeMenuWin::NativeMenuWin(Menu2Model* model, HWND system_menu_for)
: model_(model),
menu_(NULL),
- owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL)),
+ owner_draw_(false),
system_menu_for_(system_menu_for),
first_item_index_(0) {
}
@@ -332,7 +332,7 @@
void NativeMenuWin::Rebuild() {
ResetNativeMenu();
- owner_draw_ = model_->HasIcons() || owner_draw_;
+ owner_draw_ = model_->HasIcons();
first_item_index_ = model_->GetFirstItemIndex(GetNativeMenu());
for (int menu_index = first_item_index_;
menu_index < first_item_index_ + model_->GetItemCount(); ++menu_index) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698