Revert 20675 - Make native_menu_win be 'owner_drawn' when the UI font/size is...

views/controls/menu/native_menu_win.cc

 // Copyright (c) 2009 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 "views/controls/menu/native_menu_win.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ skipping 284 matching lines @@
 const wchar_t* NativeMenuWin::MenuHostWindow::kMenuHostWindowKey =
     L"__MENU_HOST_WINDOW__";
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, public:
 
 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) {
 }
 
 NativeMenuWin::~NativeMenuWin() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   DestroyMenu(menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, MenuWrapper implementation:
 
 void NativeMenuWin::RunMenuAt(const gfx::Point& point, int alignment) {
   CreateHostWindow();
   UpdateStates();
   UINT flags = TPM_LEFTBUTTON | TPM_RECURSE;
   flags |= GetAlignmentFlags(alignment);
   // Command dispatch is done through WM_MENUCOMMAND, handled by the host
   // window.
   TrackPopupMenuEx(menu_, flags, point.x(), point.y(), host_window_->hwnd(),
                    NULL);
 }
 
 void NativeMenuWin::CancelMenu() {
   EndMenu();
 }
 
 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) {
     int model_index = menu_index - first_item_index_;
     if (model_->GetTypeAt(model_index) == Menu2Model::TYPE_SEPARATOR)
       AddSeparatorItemAt(menu_index, model_index);
     else
       AddMenuItemAt(menu_index, model_index);
   }
 }
@@ skipping 187 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views