diff options
| author | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-21 17:54:18 +0000 |
|---|---|---|
| committer | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-21 17:54:18 +0000 |
| commit | 64ec0f2e4247d3ec5c0b62e4e38b19d5f4f93f44 (patch) | |
| tree | a975589084135093fd1f00e5e5c2dbfef195b174 /chrome/browser/chromeos/status/input_method_menu.h | |
| parent | ee574404469d3d302211c699c16813c696d94f34 (diff) | |
| download | chromium_src-64ec0f2e4247d3ec5c0b62e4e38b19d5f4f93f44.zip chromium_src-64ec0f2e4247d3ec5c0b62e4e38b19d5f4f93f44.tar.gz chromium_src-64ec0f2e4247d3ec5c0b62e4e38b19d5f4f93f44.tar.bz2 | |
Fix crash when InputMethodMenu model changes while menu is displayed.
InputMethodMenu::RebuildModel() apparently can be called via IBus while
the menu is being displayed. This was destroying and recreating menu
structures while they were still being used. This CL enables dynamic
changes to the menu while it is displayed.
BUG=chromium-os:16707
TEST=see bug for reproduction steps
Review URL: http://codereview.chromium.org/7189069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/input_method_menu.h')
| -rw-r--r-- | chrome/browser/chromeos/status/input_method_menu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index 19ae8a2..60d3d88 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.h @@ -26,6 +26,7 @@ class SimpleMenuModel; } // namespace ui namespace views { +class MenuItemView; class MenuModelAdapter; } // namespace views @@ -172,6 +173,7 @@ class InputMethodMenu : public views::ViewMenuDelegate, // views::MenuDelegate interface required for MenuItemView. scoped_ptr<ui::SimpleMenuModel> model_; scoped_ptr<views::MenuModelAdapter> input_method_menu_delegate_; + scoped_ptr<views::MenuItemView> input_method_menu_; int minimum_input_method_menu_width_; |