diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 19:41:18 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 19:41:18 +0000 |
| commit | a31c07b2ee3fe30375272025cdf6b96cb0317d14 (patch) | |
| tree | f1aca9d34752c302c0adb536b6703c9dd04e7a51 /chrome/browser | |
| parent | d6885592f0a7ab6b969adf0bb2da2bf9a3a5e98d (diff) | |
| download | chromium_src-a31c07b2ee3fe30375272025cdf6b96cb0317d14.zip chromium_src-a31c07b2ee3fe30375272025cdf6b96cb0317d14.tar.gz chromium_src-a31c07b2ee3fe30375272025cdf6b96cb0317d14.tar.bz2 | |
Disabling the code that assumes GtkMenu.
BUG=7598
TEST=manual. keyboard menu on oobe won't crash.
Review URL: http://codereview.chromium.org/3712002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/status/input_method_menu.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index b672d3d..17ef62c 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -380,6 +380,9 @@ void InputMethodMenu::RunMenu( // than this one should not call the Gtk+ API since it is a special API only // for a menu related to IME/keyboard. See the Gtk+ API reference at: // http://library.gnome.org/devel/gtk/stable/GtkMenuShell.html +/* + Temporarily disable due to crash. (http://crosbug.com/7598) + gfx::NativeMenu native_menu = language_menu_.GetNativeMenu(); if (native_menu) { gtk_menu_shell_set_take_focus(GTK_MENU_SHELL(native_menu), FALSE); @@ -387,6 +390,7 @@ void InputMethodMenu::RunMenu( LOG(ERROR) << "Can't call gtk_menu_shell_set_take_focus since NativeMenu is NULL"; } +*/ language_menu_.UpdateStates(); if (minimum_language_menu_width_ > 0) { |