summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 18:28:40 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 18:28:40 +0000
commit3f88476f268065d212ac567ceb3a8c2501905f93 (patch)
tree444a10af521534f22fed4b32c1719b154e528b44
parent6845f46001496a8bfd3ec3706533aeded64099ac (diff)
downloadchromium_src-3f88476f268065d212ac567ceb3a8c2501905f93.zip
chromium_src-3f88476f268065d212ac567ceb3a8c2501905f93.tar.gz
chromium_src-3f88476f268065d212ac567ceb3a8c2501905f93.tar.bz2
Make the invisible items in the system menu of a few Indian language versions of Chrome.
|owner_drawn| is currently set if the UI font family or the UI font size is overriden. However, this leads menu items to be invisible in the system menu. This was not the case in Chrome 2.0, but somehow the way 'owner_drawn' menu is drawn has changed and we have this regression. As a work around for the branch (3.0 train left, but we can merge this to 3.0.1), this CL sets |owner_drawn| to false for the system menu even if the UI font or the UI font size is overriden. BUG=18042 (http://crbug.com/18042 ) TEST=Run Chrome with '--lang=hi' command line flag on Windows. Make sure that the translated menu items in the system menu are visible (e.g. 'New Tab', 'Task Manager') although a bit too small to read while the font size in the page/wrench menu is reasonably large. Review URL: http://codereview.chromium.org/200123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27382 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--views/controls/menu/native_menu_win.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index 1de2f4f..f078d71 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -302,7 +302,8 @@ const wchar_t* NativeMenuWin::MenuHostWindow::kMenuHostWindowKey =
NativeMenuWin::NativeMenuWin(Menu2Model* model, HWND system_menu_for)
: model_(model),
menu_(NULL),
- owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL)),
+ owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL) &&
+ !system_menu_for),
system_menu_for_(system_menu_for),
first_item_index_(0) {
}