Make native_menu_win be 'owner_drawn' when the UI font/size is overriden for ...

Make native_menu_win be 'owner_drawn' when the UI font/size is overriden for Indian languages.

This is a regression with a new menu implementation.

BUG=7319
(http://crbug.com/7319 )
TEST=Run Chrome with --lang=ml or --lang=bn and see if labels in PageMenu or AppMenu  are readable.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=20675

[Ben Goodger (Google), 2009-07-14 21:45:31]

LGTM.

On Fri, Jul 10, 2009 at 6:28 PM, <jshin@chromium.org> wrote:
> Reviewers: Ben Goodger,
>
> Description:
> Make native_menu_win be 'owner_drawn' when the UI font/size is overriden
> for Indian languages.
>
> This is a regression with a new menu implementation.
>
> BUG=3D7319 (http://crbug.com/7319 )
> TEST=3DRun Chrome with --lang=3Dml or --lang=3Dbn and see if labels in
> PageMenu or AppMenu =A0are readable.
>
>
> Please review this at http://codereview.chromium.org/155403
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
> =A0M =A0 =A0 views/controls/menu/native_menu_win.cc
>
>
> Index: views/controls/menu/native_menu_win.cc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- views/controls/menu/native_menu_win.cc =A0 =A0 =A0(revision 20304)
> +++ views/controls/menu/native_menu_win.cc =A0 =A0 =A0(working copy)
> @@ -302,7 +302,7 @@
> =A0NativeMenuWin::NativeMenuWin(Menu2Model* model, HWND system_menu_for)
> =A0 =A0 : model_(model),
> =A0 =A0 =A0 menu_(NULL),
> - =A0 =A0 =A0owner_draw_(false),
> + =A0 =A0 =A0owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL)=
),
> =A0 =A0 =A0 system_menu_for_(system_menu_for),
> =A0 =A0 =A0 first_item_index_(0) {
> =A0}
> @@ -332,7 +332,8 @@
>
> =A0void NativeMenuWin::Rebuild() {
> =A0 ResetNativeMenu();
> - =A0owner_draw_ =3D model_->HasIcons();
> + =A0owner_draw_ =3D model_->HasIcons() ||
> + =A0 =A0 =A0l10n_util::NeedOverrideDefaultUIFont(NULL, NULL);
> =A0 first_item_index_ =3D model_->GetFirstItemIndex(GetNativeMenu());
> =A0 for (int menu_index =3D first_item_index_;
> =A0 =A0 =A0 =A0 menu_index < first_item_index_ + model_->GetItemCount();
> ++menu_index) {
>
>
>