diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 18:55:40 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 18:55:40 +0000 |
| commit | 4961f1e508749fd6e6b8a8376ee047c57468b81b (patch) | |
| tree | d5fbb29e1f7108033a9410fe7ae73a6ed8dbfde3 /views | |
| parent | 19a4908558c6f99c978b1d7a26712d459be309eb (diff) | |
| download | chromium_src-4961f1e508749fd6e6b8a8376ee047c57468b81b.zip chromium_src-4961f1e508749fd6e6b8a8376ee047c57468b81b.tar.gz chromium_src-4961f1e508749fd6e6b8a8376ee047c57468b81b.tar.bz2 | |
Merge 32064 - Make the char encoding indicator visible again on Windows
BUG=26438
TEST=Go to any web page and see if the character encoding is indicated in Page menu Encoding.
Patch by Satoshi.Matsuzaki with a slight modification.`(see the bug)
Review URL: http://codereview.chromium.org/391066
TBR=jshin@chromium.org
Review URL: http://codereview.chromium.org/402087
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/simple_menu_model.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/menu/simple_menu_model.cc b/views/controls/menu/simple_menu_model.cc index 67a9e2d..87b5de9 100644 --- a/views/controls/menu/simple_menu_model.cc +++ b/views/controls/menu/simple_menu_model.cc @@ -104,7 +104,8 @@ bool SimpleMenuModel::IsItemCheckedAt(int index) const { if (!delegate_) return false; int item_index = FlipIndex(index); - return (items_[item_index].type == TYPE_CHECK) ? + Menu2Model::ItemType item_type = items_[item_index].type; + return (item_type == TYPE_CHECK || item_type == TYPE_RADIO) ? delegate_->IsCommandIdChecked(GetCommandIdAt(index)) : false; } |